Brice Maron 4753cc3ebd Merge branch 'master' into multi_app_dir ... Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php		2012-06-14 21:16:59 +00:00
..
app.php	Remove OC_App::register function	2012-05-31 13:01:30 +02:00
database.xml	increase possible size of uri in database - fix oc-140	2012-06-12 19:52:25 +02:00
info.xml	mark the apps as part of the shipped package and increase the requirement to ownCloud 4	2012-05-18 16:06:57 +02:00
remote.php	Correct remote and public, and last occurence of OC::	2012-06-06 20:24:15 +00:00
update.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
version	increase version of calendar app to force db upgrade	2012-06-12 19:53:26 +02:00