Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master		2016-07-07 11:29:46 +02:00
..
apps
Core	Changed name of default logfile from owncloud.log to nextcloud.log.	2016-07-04 11:50:32 +02:00
data
docker/mariadb
lib	Changed name of default logfile from owncloud.log to nextcloud.log.	2016-07-04 11:50:32 +02:00
objectstore	fix swift primary object store test (#25281)	2016-07-05 08:54:51 +02:00
Settings	Merge branch 'master' into sync-master	2016-07-07 11:29:46 +02:00
travis	Changed name of default logfile from owncloud.log to nextcloud.log.	2016-07-04 11:50:32 +02:00
apps.php
bootstrap.php
enable_all.php
karma.config.js
phpunit-autotest-external.xml
phpunit-autotest.xml
phpunit.xml.dist
preseed-config.php
startsessionlistener.php