rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2024-12-02 06:24:11 +01:00
Code Issues Releases Activity
f61dc7cf43
OwncloudBookmarksOfficial/lib
History
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
..
bookmarks.php Merge branch 'master' into bookmark_rework 2012-09-18 19:39:53 +00:00
search.php Merge branch 'master' into bookmark_rework 2012-09-18 19:39:53 +00:00