Morris Jobke a12d2e67e7 Merge pull request #2335 from nextcloud/grouping-for-activities ... Bring back grouping for activities		2016-11-28 16:18:02 +01:00
..
composer	Update class map	2016-11-18 12:10:51 +01:00
l10n	[tx-robot] updated from transifex	2016-11-26 01:06:57 +00:00
private	Merge pull request #2335 from nextcloud/grouping-for-activities	2016-11-28 16:18:02 +01:00
public	Add an event merger and use it for the files activities	2016-11-25 15:36:11 +01:00
autoloader.php
base.php	Merge pull request #2322 from nextcloud/compat-with-chrome54	2016-11-25 12:00:56 +01:00