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/dir_032dd9e2cfe278a2cfa5eb9547448eb9.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/dir_032dd9e2cfe278a2cfa5eb9547448eb9.html')
| -rw-r--r-- | doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.html b/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.html index 6d112b738..be89737ea 100644 --- a/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.html +++ b/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.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> @@ -110,6 +110,8 @@ Files</h2></td></tr> <tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:redbasic_2php_2theme_8php"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2theme_8php.html">theme.php</a></td></tr> <tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> +<tr class="memitem:theme_2redbasic_2php_2theme__init_8php"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="theme_2redbasic_2php_2theme__init_8php.html">theme_init.php</a></td></tr> +<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> </div><!-- doc-content --> |