Lukas Reschke 01f3698175 Merge pull request #3966 from nextcloud/downstream-26570 ... Override config.php values through environment variables		2017-04-13 10:51:09 +02:00
..
composer	Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints	2017-04-12 16:01:07 +02:00
l10n	[tx-robot] updated from transifex	2017-04-13 00:08:02 +00:00
private	Merge pull request #3966 from nextcloud/downstream-26570	2017-04-13 10:51:09 +02: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