diff options
| author | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
| commit | 9b5eabf1083602382385c62c6ad7d8ae8e167f9e (patch) | |
| tree | a73ed07970a517dbad90f14954fea790193813c3 /doc/html/dir_d41ce877eb409a4791b288730010abe2.js | |
| parent | a00103b7dfa0b128cbe6ab03e6a43ccedb24f8c2 (diff) | |
| parent | 1a58777daa0ab9394f38737a806a7a185ebceeb0 (diff) | |
| download | volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.gz volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.bz2 volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.zip | |
Merge branch 'master' into newevent
Conflicts:
include/zot.php
Diffstat (limited to 'doc/html/dir_d41ce877eb409a4791b288730010abe2.js')
| -rw-r--r-- | doc/html/dir_d41ce877eb409a4791b288730010abe2.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index 2b4fa247a..684879136 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -5,7 +5,8 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "acl.php", "acl_8php.html", "acl_8php" ], [ "admin.php", "admin_8php.html", "admin_8php" ], [ "api.php", "mod_2api_8php.html", "mod_2api_8php" ], - [ "apps.php", "apps_8php.html", "apps_8php" ], + [ "appman.php", "appman_8php.html", "appman_8php" ], + [ "apps.php", "mod_2apps_8php.html", "mod_2apps_8php" ], [ "attach.php", "mod_2attach_8php.html", "mod_2attach_8php" ], [ "block.php", "block_8php.html", "block_8php" ], [ "blocks.php", "blocks_8php.html", "blocks_8php" ], |