Michael Gapczynski cbfbbe672c Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115 ... Conflicts: apps/files/templates/index.php		2012-05-17 15:38:28 -04:00
..
ajax	removing executable bit - again	2012-05-15 00:52:00 +02:00
appinfo	removing executable bit - again	2012-05-15 00:52:00 +02:00
css	Bookmarks: fix loading and displaying of the bookmarks	2012-03-01 20:57:11 +01:00
img	Bookmarks: uses the core action icons	2012-02-21 20:28:24 +01:00
js	Remove scroll to bookmarks_menu, no longer existent and the bookmark controls are always visible at the top anyways	2012-05-13 21:10:27 -04:00
l10n	Added searchprovider for bookmarks, initial l10n support for bookmark plugin	2012-02-01 15:40:59 +01:00
lib	removing executable bit - again	2012-05-15 00:52:00 +02:00
templates	Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115	2012-05-17 15:38:28 -04:00
addBm.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
bookmarksHelper.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
index.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00