Thomas Müller db39fede97 Merge branch 'master' into appframework-master ... Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php		2013-09-25 09:52:12 +02:00
..
cache.php	Note to self 2: Do as you preach. Test!	2013-09-18 15:02:25 +02:00
config.php	add function to get config object from OC_Config	2013-07-29 16:32:37 +02:00
filesystem.php	Move legacy filesystem classes	2013-05-08 16:48:47 +02:00
filesystemview.php	Move legacy filesystem classes	2013-05-08 16:48:47 +02:00
log.php	Move error handlers from OC_Log to OC\Log\ErrorHandler	2013-07-05 19:28:10 +02:00
preferences.php	Add missing return true statements to legacy preferences functions	2013-09-19 18:13:06 +02:00
updater.php	Updater: pass update url as argument to update check	2013-07-06 17:05:38 +02:00