aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-03-28 21:16:25 +0000
committerThomas Willingham <founder@kakste.com>2013-03-28 21:16:25 +0000
commitfbb4dc69c6789a04f8464afba4ea625feb880731 (patch)
tree47c746b9115d30c4ac3e686022fa497238ac68eb /doc/html/dir_d41ce877eb409a4791b288730010abe2.js
parentc8852d455e77624baf9e6ac852c1176f45462e70 (diff)
parentd0bf45972135bde9ac39a06c6fa5eb64d075a225 (diff)
downloadvolse-hubzilla-fbb4dc69c6789a04f8464afba4ea625feb880731.tar.gz
volse-hubzilla-fbb4dc69c6789a04f8464afba4ea625feb880731.tar.bz2
volse-hubzilla-fbb4dc69c6789a04f8464afba4ea625feb880731.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/html/dir_d41ce877eb409a4791b288730010abe2.js')
-rw-r--r--doc/html/dir_d41ce877eb409a4791b288730010abe2.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
index 03a53b3b4..d1ab6993a 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
@@ -104,6 +104,5 @@ var dir_d41ce877eb409a4791b288730010abe2 =
[ "xchan.php", "xchan_8php.html", "xchan_8php" ],
[ "xrd.php", "xrd_8php.html", "xrd_8php" ],
[ "zfinger.php", "zfinger_8php.html", "zfinger_8php" ],
- [ "zotfeed.php", "zotfeed_8php.html", "zotfeed_8php" ],
- [ "zperms.php", "zperms_8php.html", "zperms_8php" ]
+ [ "zotfeed.php", "zotfeed_8php.html", "zotfeed_8php" ]
]; \ No newline at end of file