aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-08-03 00:14:59 +0200
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-08-03 00:14:59 +0200
commit9294f72adb3c076932558b6f29a4c570e7962764 (patch)
treec0a7d4f5b56e922c2a572f4f0a414a405f92cd82 /doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
parentc0cd147a3a9a86b270ea32026089ced16fb2f50c (diff)
downloadvolse-hubzilla-9294f72adb3c076932558b6f29a4c570e7962764.tar.gz
volse-hubzilla-9294f72adb3c076932558b6f29a4c570e7962764.tar.bz2
volse-hubzilla-9294f72adb3c076932558b6f29a4c570e7962764.zip
Revert "merge"
This reverts commit c0cd147a3a9a86b270ea32026089ced16fb2f50c, reversing changes made to d2d1e54bfe928fe4cdfdcfc7e9acf658cda76898.
Diffstat (limited to 'doc/html/dir_d44c64559bbebec7f509842c48db8b23.html')
-rw-r--r--doc/html/dir_d44c64559bbebec7f509842c48db8b23.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
index b211c2a8a..ba55e5124 100644
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
+++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
@@ -225,6 +225,8 @@ Files</h2></td></tr>
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:session_8php"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="session_8php.html">session.php</a></td></tr>
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:include_2settings_8php"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2settings_8php.html">settings.php</a></td></tr>
+<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:socgraph_8php"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="socgraph_8php.html">socgraph.php</a></td></tr>
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:system__unavailable_8php"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="system__unavailable_8php.html">system_unavailable.php</a></td></tr>