Morris Jobke d36751ee38 Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login ... Fix login controller test and consolidate login		2017-04-13 12:16:38 -05:00
..
composer	Update static autoloadermap	2017-04-13 12:00:17 +02:00
l10n	[tx-robot] updated from transifex	2017-04-13 00:08:02 +00:00
private	Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login	2017-04-13 12:16:38 -05:00
public	Merge pull request #4307 from nextcloud/sharing-emails	2017-04-12 21:23:11 +02: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	Move OC_Defaults to OCP\Defaults	2017-04-09 21:43:01 -05:00