diff options
author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
---|---|---|
committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
commit | 870df76463a1cc9823b364db0bfb387f3f46664f (patch) | |
tree | a8c7391bfe799703aa0a8f26b9ee788f1204e8be /doc/html/globals_vars_0x78.html | |
parent | 25a533bd72c34e9775af71c010a39db6caf7b633 (diff) | |
parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
download | volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.gz volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.bz2 volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.zip |
Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
view/php/theme_init.php
Diffstat (limited to 'doc/html/globals_vars_0x78.html')
-rw-r--r-- | doc/html/globals_vars_0x78.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/html/globals_vars_0x78.html b/doc/html/globals_vars_0x78.html index 74f1231f6..4eebc0799 100644 --- a/doc/html/globals_vars_0x78.html +++ b/doc/html/globals_vars_0x78.html @@ -28,7 +28,7 @@ <table cellspacing="0" cellpadding="0"> <tbody> <tr style="height: 56px;"> - <td id="projectlogo"><img alt="Logo" src="rhash-64.png"/></td> + <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td> <td style="padding-left: 0.5em;"> <div id="projectname">The Red Matrix </div> @@ -154,6 +154,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x78.html','');}); <li>XCHAN_FLAGS_SELFCENSORED : <a class="el" href="boot_8php.html#a5a681a672e007cdc22b43345d71f07c6">boot.php</a> </li> +<li>XCHAN_FLAGS_SYSTEM +: <a class="el" href="boot_8php.html#afef254290febac854c85fc698d9483a6">boot.php</a> +</li> </ul> </div><!-- contents --> </div><!-- doc-content --> |