diff options
author | zotlabs <mike@macgirvin.com> | 2018-05-05 02:24:37 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-05-05 02:24:37 -0700 |
commit | 894f5bc79a7fc91ee1f5a3502f3069a48abcb4f5 (patch) | |
tree | 55f014ff2183c88f8d51b3808840e5852dfa697f /include/network.php | |
parent | b47b917eb0a8bcc8e07a8978bf9a18a2e199d96c (diff) | |
parent | 0895756658e3019b2badf876d4699e298234208c (diff) | |
download | volse-hubzilla-894f5bc79a7fc91ee1f5a3502f3069a48abcb4f5.tar.gz volse-hubzilla-894f5bc79a7fc91ee1f5a3502f3069a48abcb4f5.tar.bz2 volse-hubzilla-894f5bc79a7fc91ee1f5a3502f3069a48abcb4f5.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include/network.php')
-rw-r--r-- | include/network.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/network.php b/include/network.php index 8b7490a8a..26ed24de2 100644 --- a/include/network.php +++ b/include/network.php @@ -2052,4 +2052,4 @@ function jsonld_document_loader($url) { } return []; -}
\ No newline at end of file +} |