Morris Jobke 01705b1b6a Merge pull request #4515 from nextcloud/downstream-27643 ... Adjust query/event logging code in favour of more complex owncloud/di…		2017-04-26 22:58:01 -03: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-27 00:07:40 +00:00
private	Merge pull request #4515 from nextcloud/downstream-27643	2017-04-26 22:58:01 -03:00
public	Fix missing conflict resolutions	2017-04-26 17:05:59 +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	Make the emergency disable also accept arrays	2017-04-26 20:07:51 +02:00