diff options
| author | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
|---|---|---|
| committer | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
| commit | 5cca00ddc79dad667464674e08a2a860e262eabd (patch) | |
| tree | 53df980e32a6706e977a5a2276e0f9aa9ec09300 /doc/html/globals_func_0x61.html | |
| parent | 67166180bb560276273a20bcd9ca2a7aae036aba (diff) | |
| parent | a79072ce478a999b06df38ae324fbcef6d3a76e7 (diff) | |
| download | volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2 volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/tpl/theme_settings.tpl
reset to upstream
Diffstat (limited to 'doc/html/globals_func_0x61.html')
| -rw-r--r-- | doc/html/globals_func_0x61.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index f553207f3..72288257f 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -414,7 +414,7 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');}); : <a class="el" href="apps_8php.html#a546016cb960d0b110ee8e489dfa6c27c">apps.php</a> </li> <li>apw_form() -: <a class="el" href="view_2theme_2apw_2php_2config_8php.html#a8b51951a70e1c1324be71345a61d70ec">config.php</a> +: <a class="el" href="view_2theme_2apw_2php_2config_8php.html#ad59fc09da66b66267f9753c8b2dd68d0">config.php</a> </li> <li>apw_init() : <a class="el" href="apw_2php_2theme_8php.html#a42167c539043a39a6b83c252d05f1e89">theme.php</a> |