diff options
| author | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
| commit | 9b5eabf1083602382385c62c6ad7d8ae8e167f9e (patch) | |
| tree | a73ed07970a517dbad90f14954fea790193813c3 /app/bookmarks.apd | |
| parent | a00103b7dfa0b128cbe6ab03e6a43ccedb24f8c2 (diff) | |
| parent | 1a58777daa0ab9394f38737a806a7a185ebceeb0 (diff) | |
| download | volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.gz volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.bz2 volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.zip | |
Merge branch 'master' into newevent
Conflicts:
include/zot.php
Diffstat (limited to 'app/bookmarks.apd')
| -rw-r--r-- | app/bookmarks.apd | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/bookmarks.apd b/app/bookmarks.apd new file mode 100644 index 000000000..f126a35c5 --- /dev/null +++ b/app/bookmarks.apd @@ -0,0 +1,4 @@ +url: $baseurl/bookmarks +requires: local_user +name: Bookmarks +photo: $baseurl/app/bookmarks.png |