aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-07-02 18:36:39 +0100
committerThomas Willingham <founder@kakste.com>2013-07-02 18:36:39 +0100
commitd1cae2da2abc3a602f682114bc02cce08a7e7578 (patch)
treeef3147f9db85bdde8e26303971a40d86e10bb508 /doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
parent33696cc8392daeb08d011aa3b1209f3b121898ea (diff)
parentb86253c655f974920c4d3de0915611a7e66c7336 (diff)
downloadvolse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.gz
volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.bz2
volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/html/dir_d44c64559bbebec7f509842c48db8b23.js')
-rw-r--r--doc/html/dir_d44c64559bbebec7f509842c48db8b23.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
index 8be6beda8..6dd34558a 100644
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
+++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
@@ -75,8 +75,10 @@ var dir_d44c64559bbebec7f509842c48db8b23 =
[ "queue_fn.php", "queue__fn_8php.html", "queue__fn_8php" ],
[ "security.php", "security_8php.html", "security_8php" ],
[ "session.php", "session_8php.html", "session_8php" ],
+ [ "settings.php", "include_2settings_8php.html", "include_2settings_8php" ],
[ "socgraph.php", "socgraph_8php.html", "socgraph_8php" ],
[ "system_unavailable.php", "system__unavailable_8php.html", "system__unavailable_8php" ],
+ [ "taxonomy.php", "taxonomy_8php.html", "taxonomy_8php" ],
[ "template_processor.php", "template__processor_8php.html", "template__processor_8php" ],
[ "text.php", "text_8php.html", "text_8php" ],
[ "zot.php", "zot_8php.html", "zot_8php" ]