aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x61.html
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-26 18:27:03 -0800
committerfriendica <info@friendica.com>2015-01-26 18:27:03 -0800
commitac594183c6fdc6cf4d5a2a29ade7478a17336397 (patch)
treed38f73727da4d8697b00d2102ae10b501d1909ce /doc/html/globals_0x61.html
parente6bfe3f2c10e851ed5ba49886ec8d0a9a9de2296 (diff)
parent9f5bfca28dde23893156ad36682e20ca2fc0dd45 (diff)
downloadvolse-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/globals_0x61.html')
-rw-r--r--doc/html/globals_0x61.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html
index 2cc98ef7d..624e186d5 100644
--- a/doc/html/globals_0x61.html
+++ b/doc/html/globals_0x61.html
@@ -262,9 +262,6 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
<li>ACTIVITY_FAVORITE
: <a class="el" href="boot_8php.html#a3e2ea123d29a72012db1241f96280b0e">boot.php</a>
</li>
-<li>ACTIVITY_FILE
-: <a class="el" href="boot_8php.html#a7cfd5a02abaf6d85e2f915ccf60dca46">boot.php</a>
-</li>
<li>ACTIVITY_FOLLOW
: <a class="el" href="boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434">boot.php</a>
</li>
@@ -292,6 +289,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
<li>ACTIVITY_OBJ_EVENT
: <a class="el" href="boot_8php.html#a2e90096fede6acce16abf0da8cb2febe">boot.php</a>
</li>
+<li>ACTIVITY_OBJ_FILE
+: <a class="el" href="boot_8php.html#aa726114f13c1119ae77c3464d6afeaed">boot.php</a>
+</li>
<li>ACTIVITY_OBJ_GROUP
: <a class="el" href="boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3">boot.php</a>
</li>