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
..
addBm.php	Almost working in inline bookmark edit/add.	2012-09-02 15:18:36 +00:00
bookmarklet.php	adding space between) and {	2012-09-07 15:21:03 +02:00
list.php	Merge branch 'master' into bookmark_rework	2012-09-18 19:39:53 +00:00
settings.php	Merge branch 'master' into bookmark_rework	2012-09-18 19:39:53 +00:00