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/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.js | |
| 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/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.js')
| -rw-r--r-- | doc/html/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/html/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.js b/doc/html/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.js index 749793501..5a54bf95f 100644 --- a/doc/html/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.js +++ b/doc/html/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.js @@ -1,6 +1,8 @@ var dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5 = [ [ "config.php", "view_2theme_2apw_2php_2config_8php.html", "view_2theme_2apw_2php_2config_8php" ], + [ "functions.php", "functions_8php.html", "functions_8php" ], [ "style.php", "apw_2php_2style_8php.html", "apw_2php_2style_8php" ], - [ "theme.php", "apw_2php_2theme_8php.html", "apw_2php_2theme_8php" ] + [ "theme.php", "apw_2php_2theme_8php.html", "apw_2php_2theme_8php" ], + [ "theme_init.php", "theme_2apw_2php_2theme__init_8php.html", "theme_2apw_2php_2theme__init_8php" ] ];
\ No newline at end of file |