nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #24256 from owncloud/scanner-propagate	Morris Jobke	2016-04-26	1	-0/+16
\|\
\| *	triger the propagator from the command line scanner	Robin Appelman	2016-04-25	1	-0/+16
* \|	do propagation in a single query	Robin Appelman	2016-04-25	4	-26/+54
\|/
*	Merge pull request #24248 from owncloud/d--j-master	Thomas Müller	2016-04-25	5	-10/+34
\|\
\| *	Merge branch 'master' of https://github.com/d--j/core into d--j-master	Thomas Müller	2016-04-25	5	-10/+34
* \|	Merge branch 'patch-1' of https://github.com/weits/core into weits-patch-1	Thomas Müller	2016-04-25	1	-1/+1
\|/
*	add locks in the scanner to prevent multiple scanners running on the same files	Robin Appelman	2016-04-25	1	-0/+2
*	Move \OC\Files to PSR-4	Roeland Jago Douma	2016-04-24	65	-0/+18273