Robin Appelman c9f3f2874f Merge branch 'master' into update-parent-storage-mtime ... Conflicts: lib/private/files/cache/updater.php		2013-10-30 13:41:10 +01:00
..
l10n	[tx-robot] updated from transifex	2013-10-29 07:31:51 -04:00
private	Merge branch 'master' into update-parent-storage-mtime	2013-10-30 13:41:10 +01:00
public	pass the name of the item source from the browser to the server - no need to get the data via complicated db queries	2013-10-23 18:39:37 +02:00
autoloader.php	Merge pull request #5071 from owncloud/fix-autoloader-master	2013-10-02 03:10:10 -07:00
base.php	Merge pull request #3889 from owncloud/apps_preload	2013-10-28 03:17:52 -07:00