Brice Maron f61dc7cf43 Merge branch 'master' into bookmark_rework ...

Conflicts:
	bookmarks/addBm.php
	bookmarks/ajax/editBookmark.php
	bookmarks/bookmarksHelper.php
	bookmarks/lib/bookmarks.php
	bookmarks/lib/search.php
	bookmarks/templates/bookmarklet.php
	bookmarks/templates/list.php

2012-09-18 19:39:53 +00:00

..

app.php

Remove OC_App::register function

2012-05-31 13:01:30 +02:00

database.xml

Add description column for bookmarks and correct adding public link

2012-08-30 20:06:13 +00: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

migrate.php

adding space between) and {

2012-09-07 15:21:03 +02:00

version

Add description column for bookmarks and correct adding public link

2012-08-30 20:06:13 +00:00