Vincent Petry 7be1094ba5 Merge pull request #24173 from owncloud/master-certificate ... [master] Ignore certificate file if it starts with file://		2016-04-22 09:28:07 +02:00
..
composer	Move OC\Core and OC\Settings to composer autoloader	2016-04-05 16:47:38 +02:00
l10n	[tx-robot] updated from transifex	2016-04-22 01:54:58 -04:00
private	Merge pull request #24173 from owncloud/master-certificate	2016-04-22 09:28:07 +02:00
public	Merge pull request #24127 from owncloud/handle-app-loading-error	2016-04-20 22:41:02 +02:00
autoloader.php	Merge pull request #23819 from owncloud/move-core-completely-to-psr4	2016-04-06 13:31:44 +02:00
base.php	Merge pull request #24075 from owncloud/no-html-on-cli	2016-04-20 13:50:43 +02:00