Vincent Petry 12683b786d Merge pull request #24991 from owncloud/2fa-do-not-generate-token ... do not generate device token if 2FA is enable for user		2016-06-08 10:13:04 +02:00
..
apps
Core	do not generate device token if 2FA is enable for user	2016-06-07 09:09:51 +02:00
data
docker/mariadb
lib	Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only	2016-06-08 10:12:28 +02:00
objectstore
Settings	Move parallel merged auth tests to PSR-4	2016-05-25 12:02:05 +02:00
travis
apps.php	Fix the tests again	2016-05-25 16:51:02 +02:00
bootstrap.php
enable_all.php
karma.config.js
phpunit-autotest-external.xml	Adjust the phpunit config	2016-05-25 15:14:37 +02:00
phpunit-autotest.xml
phpunit.xml.dist
preseed-config.php
startsessionlistener.php