aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-31 00:50:20 -0800
committerfriendica <info@friendica.com>2015-01-31 00:50:20 -0800
commite6a5f7800390e5091743d6a97c6fd8f54c5d1530 (patch)
tree20c49c7d11b411b91530ef43374a208274ebbb57 /doc/html/dir_d41ce877eb409a4791b288730010abe2.js
parent4a243b63f7019a1e56ecf03b138cd7fc396236c2 (diff)
parent3e5226adc70838c784a0b208de25fffde37a6679 (diff)
downloadvolse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.gz
volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.bz2
volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.zip
Merge branch 'master' into tres
Conflicts: include/zot.php
Diffstat (limited to 'doc/html/dir_d41ce877eb409a4791b288730010abe2.js')
-rw-r--r--doc/html/dir_d41ce877eb409a4791b288730010abe2.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
index 8a9ca512d..0f1ea5e3f 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
@@ -87,6 +87,7 @@ var dir_d41ce877eb409a4791b288730010abe2 =
[ "poke.php", "poke_8php.html", "poke_8php" ],
[ "poll.php", "poll_8php.html", "poll_8php" ],
[ "post.php", "post_8php.html", "post_8php" ],
+ [ "prate.php", "prate_8php.html", "prate_8php" ],
[ "prep.php", "prep_8php.html", "prep_8php" ],
[ "pretheme.php", "pretheme_8php.html", "pretheme_8php" ],
[ "probe.php", "mod_2probe_8php.html", "mod_2probe_8php" ],
@@ -144,6 +145,7 @@ var dir_d41ce877eb409a4791b288730010abe2 =
[ "webpages.php", "webpages_8php.html", "webpages_8php" ],
[ "wfinger.php", "wfinger_8php.html", "wfinger_8php" ],
[ "xchan.php", "xchan_8php.html", "xchan_8php" ],
+ [ "xpoco.php", "xpoco_8php.html", "xpoco_8php" ],
[ "xrd.php", "xrd_8php.html", "xrd_8php" ],
[ "xref.php", "xref_8php.html", "xref_8php" ],
[ "zfinger.php", "zfinger_8php.html", "zfinger_8php" ],