aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorHubzilla <hubzilla@hz.macgirvin.com>2017-01-19 15:40:28 -0800
committerHubzilla <hubzilla@hz.macgirvin.com>2017-01-19 15:40:28 -0800
commitf57926d9ece52df0208695bdf48b918444448ed1 (patch)
tree5670aa2c00711ca0fa7c9693841675ad7f803faf /Zotlabs/Lib
parent96f196febda488e1db2d9a677fd5eb736aa76ae6 (diff)
parent4295b1945e08b7e93286b4e51c3ba26a3828f80b (diff)
downloadvolse-hubzilla-f57926d9ece52df0208695bdf48b918444448ed1.tar.gz
volse-hubzilla-f57926d9ece52df0208695bdf48b918444448ed1.tar.bz2
volse-hubzilla-f57926d9ece52df0208695bdf48b918444448ed1.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/NativeWiki.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php
index 8932040b0..31a893133 100644
--- a/Zotlabs/Lib/NativeWiki.php
+++ b/Zotlabs/Lib/NativeWiki.php
@@ -196,4 +196,4 @@ class NativeWiki {
return array('read' => true, 'write' => $write, 'success' => true);
}
}
-} \ No newline at end of file
+}