1
0
mirror of https://github.com/owncloud/bookmarks.git synced 2025-02-18 15:54:28 +01:00
Brice Maron b5a7f1ad29 Merge branch 'master' into multi_app_dir
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
2012-06-14 21:16:59 +00:00
..
2012-06-10 23:38:26 +02:00
2012-06-10 23:38:26 +02:00
2012-06-10 23:38:26 +02:00
2012-06-10 23:38:26 +02:00
2012-06-10 23:38:26 +02:00