Dennis Schubert ad52eaf6d7 Merge branch 'stable' into develop		2015-06-08 04:09:57 +02:00
..
assets	Fix Bootstrap 3 regression: add email visibility icon to settings page	2015-06-07 22:31:58 +02:00
controllers	Merge branch 'stable' into develop	2015-06-08 00:49:55 +02:00
helpers	Issue #4297: Color themes can override bootstrap variables	2015-06-07 19:58:54 +03:00
mailers	replace Rails.logger with logging-logger	2015-06-04 04:17:15 +02:00
models	Merge branch 'stable' into develop	2015-06-08 04:09:57 +02:00
presenters	Only return the current_users participation for post interactions	2015-05-30 03:08:25 +02:00
serializers/export	Add created_at to json posts for #5585	2015-01-28 10:21:16 +13:00
uploaders	Add a token the filename for exported user data	2015-04-22 20:19:17 +02:00
views	Merge pull request #6080 from svbergerem/user-edit-remove-cancel-button	2015-06-08 01:07:51 +02:00
workers	add logging mixin and replace federation-logger	2015-06-04 04:16:03 +02:00