Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master		2016-07-07 11:29:46 +02:00
..
BackgroundJob	Update license headers	2016-05-26 19:57:24 +02:00
Command	Move Files app to PSR-4 (#24569)	2016-05-12 12:07:06 +02:00
Controller	Adjust test to work with phpunit < 5.2	2016-06-08 09:24:00 +02:00
Service	Update license headers	2016-05-26 19:57:24 +02:00
js	Merge branch 'master' into sync-master	2016-07-07 11:29:46 +02:00
ActivityTest.php	Move Files app to PSR-4 (#24569)	2016-05-12 12:07:06 +02:00
HelperTest.php	Move Files app to PSR-4 (#24569)	2016-05-12 12:07:06 +02:00