Jonne Haß 1515848120 Merge branch 'release/0.4.1.0' into develop ... Conflicts: app/controllers/conversations_controller.rb spec/controllers/conversations_controller_spec.rb		2014-08-30 20:09:08 +02:00
..
assets	Merge pull request #5138 from svbergerem/bootstrap-tags-view	2014-08-28 23:12:32 +02:00
controllers	Merge branch 'release/0.4.1.0' into develop	2014-08-30 20:09:08 +02:00
helpers	Dynamic asset paths everywhere	2014-08-28 21:04:29 +02:00
mailers	Allow sending emails with custom subject via Notifier.admin	2014-08-17 18:02:16 +03:00
models	Dynamic asset paths everywhere	2014-08-28 21:04:29 +02:00
presenters	replace deprecated usages for all	2014-08-23 16:34:01 +02:00
uploaders	resize full scaled image to a specific width #3793	2013-01-26 11:36:01 +01:00
views	Rounded contact search input	2014-08-29 14:45:16 +02:00
workers	make status message controller spec pass and deprecation free	2014-08-23 16:34:00 +02:00