diff options
| author | friendica <info@friendica.com> | 2015-01-26 18:27:03 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-26 18:27:03 -0800 |
| commit | ac594183c6fdc6cf4d5a2a29ade7478a17336397 (patch) | |
| tree | d38f73727da4d8697b00d2102ae10b501d1909ce /doc/html/navtree.js | |
| parent | e6bfe3f2c10e851ed5ba49886ec8d0a9a9de2296 (diff) | |
| parent | 9f5bfca28dde23893156ad36682e20ca2fc0dd45 (diff) | |
| download | volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.tar.gz volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.tar.bz2 volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.zip | |
Merge branch 'master' into tres and add some work on the item_deleted flag refactor
Conflicts:
include/attach.php
include/onedirsync.php
include/zot.php
mod/locs.php
Diffstat (limited to 'doc/html/navtree.js')
| -rw-r--r-- | doc/html/navtree.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/html/navtree.js b/doc/html/navtree.js index f7469da83..f4f8c00bf 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -42,10 +42,10 @@ var NAVTREEINDEX = "classRedMatrix_1_1RedDAV_1_1RedFile.html#ab7ab7ba81fab28eb02382cfdfd80ecfe", "datetime_8php.html#a77bb385ae8a9e7ca663309c102c0d766", "functions_func_0x65.html", -"include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86", -"manage_8php.html", -"profperm_8php.html", -"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f" +"include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d", +"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a", +"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04", +"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623" ]; var SYNCONMSG = 'click to disable panel synchronisation'; |