Michael Gapczynski f180922709 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

..

addBm.php

Changed bookmarklet to read later widget

2012-02-22 23:52:56 +01:00

bookmarklet.php

removing executable bit - again

2012-05-15 00:52:00 +02:00

list.php

Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115

2012-05-17 15:38:28 -04:00

settings.php

sharing code between the two bookmarklets

2012-02-22 16:38:05 -05:00