Thomas Müller 6ff96b34ad Merge branch 'master' into load-apps-proper-master ... Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php		2014-03-21 14:05:08 +01:00
..
appconfig.php	Check whether the app is set	2014-02-18 14:12:49 +01:00
preview.php	rename url parameter	2014-02-24 13:24:10 +01:00
share.php	Merge pull request #7557 from owncloud/issue/7297	2014-03-19 15:53:08 +01:00
translations.php	return plural form in ajax translations	2013-08-03 23:27:18 +02:00
update.php	Merge branch 'master' into load-apps-proper-master	2014-03-21 14:05:08 +01:00