aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/search/files_7a.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/search/files_7a.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/search/files_7a.js')
-rw-r--r--doc/html/search/files_7a.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/html/search/files_7a.js b/doc/html/search/files_7a.js
index 02bfad2af..f3e2fc21d 100644
--- a/doc/html/search/files_7a.js
+++ b/doc/html/search/files_7a.js
@@ -2,6 +2,5 @@ var searchData=
[
['zfinger_2ephp',['zfinger.php',['../zfinger_8php.html',1,'']]],
['zot_2ephp',['zot.php',['../zot_8php.html',1,'']]],
- ['zotfeed_2ephp',['zotfeed.php',['../zotfeed_8php.html',1,'']]],
- ['zperms_2ephp',['zperms.php',['../zperms_8php.html',1,'']]]
+ ['zotfeed_2ephp',['zotfeed.php',['../zotfeed_8php.html',1,'']]]
];