Jonne Haß 188e554b7b Merge branch 'stable' into develop		2015-06-21 20:48:57 +02:00
..
assets	Merge pull request #6109 from svbergerem/bootstrap-header-rewrite	2015-06-21 19:46:07 +02:00
controllers	Merge branch 'stable' into develop	2015-06-21 20:48:57 +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-21 20:48:57 +02:00
presenters	Remove old service keys in statistics.json	2015-06-13 11:03:47 +02:00
serializers/export
uploaders	Add a token the filename for exported user data	2015-04-22 20:19:17 +02:00
views	Merge pull request #6109 from svbergerem/bootstrap-header-rewrite	2015-06-21 19:46:07 +02:00
workers	add logging mixin and replace federation-logger	2015-06-04 04:16:03 +02:00