Roeland Jago Douma 9da697b11a Merge pull request #4524 from nextcloud/downstream-27508 ... Keep file id on move		2017-04-28 09:37:40 +02:00
..
composer	Merge pull request #4515 from nextcloud/downstream-27643	2017-04-26 22:58:01 -03:00
l10n	[tx-robot] updated from transifex	2017-04-28 00:07:41 +00:00
private	Merge pull request #4524 from nextcloud/downstream-27508	2017-04-28 09:37:40 +02:00
public	Merge pull request #4522 from nextcloud/downstream-27596	2017-04-27 16:41:08 -03:00
autoloader.php	Revert "Add a magic wrapper to allow phpunit4 to run the code again "	2017-03-20 14:25:43 +01:00
base.php	Make the emergency disable also accept arrays	2017-04-26 20:07:51 +02:00