Jonne Haß 146f7eea52 Merge branch 'stable' into develop		2015-05-29 11:42:03 +02:00
..
assets	Merge branch 'stable' into develop	2015-05-29 11:42:03 +02:00
controllers
helpers	Merge branch 'stable' into develop	2015-05-29 11:39:36 +02:00
mailers	gracefully handle when a like is already deleted again	2015-05-24 02:30:02 +02:00
models	Merge branch 'stable' into develop	2015-05-28 11:24:34 +02:00
presenters	Introduce 'authorized' configuration option for services	2015-05-25 04:18:38 +02:00
serializers/export
uploaders
views	Merge branch 'stable' into develop	2015-05-29 11:39:36 +02:00
workers	handle when the diaspora xml parser returns nil	2015-05-28 01:34:24 +02:00