aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Web
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-09-03 17:17:20 -0700
committerzotlabs <mike@macgirvin.com>2017-09-03 17:17:20 -0700
commit4adf2caaa687287cf82b930bb5a0c07d39c7afc0 (patch)
tree670ce1e8c82b813ce86b6c8815e66ea6ea3a5adb /Zotlabs/Web
parentdb82d303e217c2ca599a8b740ebb62339d373124 (diff)
parent0fac35686b28825da69c77f9a903e4e24a7036fa (diff)
downloadvolse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.tar.gz
volse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.tar.bz2
volse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Web')
-rw-r--r--Zotlabs/Web/WebServer.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
index 4e8dc6786..a66384c40 100644
--- a/Zotlabs/Web/WebServer.php
+++ b/Zotlabs/Web/WebServer.php
@@ -137,4 +137,4 @@ class WebServer {
killme();
}
-} \ No newline at end of file
+}