Dennis Schubert d67ec12913 Merge branch 'Faldrian-3307-collapse_long_images' into develop		2016-02-07 05:55:14 +01:00
..
assets	Merge branch 'Faldrian-3307-collapse_long_images' into develop	2016-02-07 05:55:14 +01:00
controllers	Merge branch 'stable' into develop	2016-01-28 18:47:18 +01:00
helpers	Fix no reaction case	2016-02-03 16:06:24 +01:00
mailers	Uncapitalize type if trying to find translation-string	2015-10-07 16:51:17 +02:00
models	Merge branch 'stable' into develop	2016-01-26 15:19:55 +01:00
presenters	Merge branch 'stable' into develop	2016-01-26 15:19:55 +01:00
serializers	Fix remarks	2016-01-04 16:49:57 +09:00
services	Extract service from comments controller	2015-08-09 18:35:11 +02:00
uploaders	Add a token the filename for exported user data	2015-04-22 20:19:17 +02:00
views	Unify settings ui	2016-02-06 14:15:04 +01:00
workers	Replace sidetiq with sidekiq-cron	2016-01-24 07:20:44 +01:00