aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x61.html
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2015-01-23 17:26:37 -0800
committerHabeas Codice <habeascodice@federated.social>2015-01-23 17:26:37 -0800
commit0405f2bcb973118e6567fd44a7994aa06f54fe7a (patch)
tree8926d35b5168111ab3f80d517ed97bce660181b1 /doc/html/globals_0x61.html
parent891d231bbe4ee4499cf9e62013971b85a0542404 (diff)
parentbe9fc16bd5833e58ba2c3e5ed19153548437fe45 (diff)
downloadvolse-hubzilla-0405f2bcb973118e6567fd44a7994aa06f54fe7a.tar.gz
volse-hubzilla-0405f2bcb973118e6567fd44a7994aa06f54fe7a.tar.bz2
volse-hubzilla-0405f2bcb973118e6567fd44a7994aa06f54fe7a.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>