aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x61.html
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2015-01-23 14:51:15 +0100
committermarijus <mario@mariovavti.com>2015-01-23 14:51:15 +0100
commit884d542d4b9b4b1c3b141933e2bb464ad98abbb7 (patch)
tree068363c54ba15e686427b25dd9eebf20b926a14e /doc/html/globals_0x61.html
parent8789c96e78734cbc5420404eff149e514fe17ee7 (diff)
parent7cd4374e3d2833725beeb1c3b65687dc0856619c (diff)
downloadvolse-hubzilla-884d542d4b9b4b1c3b141933e2bb464ad98abbb7.tar.gz
volse-hubzilla-884d542d4b9b4b1c3b141933e2bb464ad98abbb7.tar.bz2
volse-hubzilla-884d542d4b9b4b1c3b141933e2bb464ad98abbb7.zip
Merge branch 'master' of https://github.com/friendica/red
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>