aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x75.html
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-31 00:50:20 -0800
committerfriendica <info@friendica.com>2015-01-31 00:50:20 -0800
commite6a5f7800390e5091743d6a97c6fd8f54c5d1530 (patch)
tree20c49c7d11b411b91530ef43374a208274ebbb57 /doc/html/globals_0x75.html
parent4a243b63f7019a1e56ecf03b138cd7fc396236c2 (diff)
parent3e5226adc70838c784a0b208de25fffde37a6679 (diff)
downloadvolse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.gz
volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.bz2
volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.zip
Merge branch 'master' into tres
Conflicts: include/zot.php
Diffstat (limited to 'doc/html/globals_0x75.html')
-rw-r--r--doc/html/globals_0x75.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/html/globals_0x75.html b/doc/html/globals_0x75.html
index 9965e3843..299d7af06 100644
--- a/doc/html/globals_0x75.html
+++ b/doc/html/globals_0x75.html
@@ -262,6 +262,9 @@ $(document).ready(function(){initNavTree('globals_0x75.html','');});
<li>user_remove()
: <a class="el" href="Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15">Contact.php</a>
</li>
+<li>userReadableSize()
+: <a class="el" href="text_8php.html#afb1ae3e1f6985d4b78dd1d00473e39fb">text.php</a>
+</li>
</ul>
</div><!-- contents -->
</div><!-- doc-content -->