mirror of
https://github.com/owncloud/bookmarks.git
synced 2025-03-31 17:25:21 +02:00
Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php
Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php