Dennis Schubert 944c57f874 Merge branch 'stable' into develop		2015-05-18 03:23:43 +02:00
..
assets	Merge branch 'stable' into develop	2015-05-16 03:42:18 +02:00
controllers	Mobile: manage followed tags	2015-05-12 04:00:07 +02:00
helpers	Merge branch 'stable' into develop	2015-05-18 03:23:43 +02:00
mailers	Fix missing localization of inactive user removal warning emails.	2015-05-16 03:40:06 +02:00
models	Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations""	2015-05-04 00:43:41 +02:00
presenters	Pass along current_user in ContactPresenter#full_hash_with_person	2015-05-09 23:48:59 +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 branch 'stable' into develop	2015-05-16 03:42:18 +02:00
workers	remove some hardcoded diasporahq hax	2015-05-18 03:23:14 +02:00