aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Web/Controller.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-15 08:42:51 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-15 08:42:51 +0200
commit9a0dff08bc488646602424fbd030bfd097e8cda9 (patch)
treee32a25fe7a570573ffee617592678a420bb7ee4c /Zotlabs/Web/Controller.php
parent24569a18dbb423f47429905cb38282813b0a6462 (diff)
parent77dedf664846c9740cb66bf2a95c95c6522c0497 (diff)
downloadvolse-hubzilla-9a0dff08bc488646602424fbd030bfd097e8cda9.tar.gz
volse-hubzilla-9a0dff08bc488646602424fbd030bfd097e8cda9.tar.bz2
volse-hubzilla-9a0dff08bc488646602424fbd030bfd097e8cda9.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Web/Controller.php')
-rw-r--r--Zotlabs/Web/Controller.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Web/Controller.php b/Zotlabs/Web/Controller.php
index ac835e008..2d0f58891 100644
--- a/Zotlabs/Web/Controller.php
+++ b/Zotlabs/Web/Controller.php
@@ -9,4 +9,5 @@ class Controller {
function post() {}
function get() {}
-} \ No newline at end of file
+}
+