diff options
| author | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
|---|---|---|
| committer | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
| commit | ebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch) | |
| tree | c23cbf55aac433c90ac254d0684dabf9d4528133 /doc/html/admin_8php.js | |
| parent | 5cca00ddc79dad667464674e08a2a860e262eabd (diff) | |
| parent | d0834c7e1394e1986b2b00e039125deff74d9e5e (diff) | |
| download | volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2 volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
whatever
Diffstat (limited to 'doc/html/admin_8php.js')
| -rw-r--r-- | doc/html/admin_8php.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/html/admin_8php.js b/doc/html/admin_8php.js index 973a7a9aa..15b1b3522 100644 --- a/doc/html/admin_8php.js +++ b/doc/html/admin_8php.js @@ -1,6 +1,8 @@ var admin_8php = [ [ "admin_content", "admin_8php.html#afef415e4011607fbb665610441595015", null ], + [ "admin_page_channels", "admin_8php.html#ad6f87a764fd35f522c7b4c351d7878ec", null ], + [ "admin_page_channels_post", "admin_8php.html#a42e628f367c168add8013352ac74d33f", null ], [ "admin_page_dbsync", "admin_8php.html#aaa6addf2dbc3f3fcf99244a56b41eade", null ], [ "admin_page_hubloc", "admin_8php.html#a6943543f3138f6ee182cb701f415d1cc", null ], [ "admin_page_hubloc_post", "admin_8php.html#a60ba9783ad14545814919970bc3fb725", null ], |