aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-18 23:02:49 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-18 23:02:49 -0700
commit63146821d7f28107ca34fbe581dcc3abf6fd49fe (patch)
tree579fecd828a42463c0a2bf2a99ff95e316610201 /include
parent40bb1699a564cc027f7b1d2b04d8a0a4d4ce4050 (diff)
parent9ed8eac8c624a5910710745a03a450291828a22d (diff)
downloadvolse-hubzilla-63146821d7f28107ca34fbe581dcc3abf6fd49fe.tar.gz
volse-hubzilla-63146821d7f28107ca34fbe581dcc3abf6fd49fe.tar.bz2
volse-hubzilla-63146821d7f28107ca34fbe581dcc3abf6fd49fe.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include')
-rw-r--r--include/zot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 0b713faae..6c5a8c289 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3697,4 +3697,4 @@ function zotinfo($arr) {
}
call_hooks('zot_finger',$ret);
return($ret);
-} \ No newline at end of file
+}