aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-19 16:18:04 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-19 16:18:04 -0700
commitea37882b9533b2d6054a36568ef6ab9cc834478e (patch)
tree1e5ad716071560311bc0f19c5fc8519132e4630c /mod
parent9f424bb20881841926976417d7eea04c0c14bdb3 (diff)
parent599a0c66b221f2c3a86462f920856d68630142cd (diff)
downloadvolse-hubzilla-ea37882b9533b2d6054a36568ef6ab9cc834478e.tar.gz
volse-hubzilla-ea37882b9533b2d6054a36568ef6ab9cc834478e.tar.bz2
volse-hubzilla-ea37882b9533b2d6054a36568ef6ab9cc834478e.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/zot.php install/schema_mysql.sql install/schema_postgres.sql install/update.php mod/zfinger.php
Diffstat (limited to 'mod')
-rw-r--r--mod/zfinger.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/mod/zfinger.php b/mod/zfinger.php
index fb3333280..fff7c9e1b 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -9,5 +9,4 @@ function zfinger_init(&$a) {
$x = zotinfo($_REQUEST);
json_return_and_die($x);
-
}