diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-15 08:42:51 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-15 08:42:51 +0200 |
| commit | 9a0dff08bc488646602424fbd030bfd097e8cda9 (patch) | |
| tree | e32a25fe7a570573ffee617592678a420bb7ee4c /Zotlabs/Web | |
| parent | 24569a18dbb423f47429905cb38282813b0a6462 (diff) | |
| parent | 77dedf664846c9740cb66bf2a95c95c6522c0497 (diff) | |
| download | volse-hubzilla-9a0dff08bc488646602424fbd030bfd097e8cda9.tar.gz volse-hubzilla-9a0dff08bc488646602424fbd030bfd097e8cda9.tar.bz2 volse-hubzilla-9a0dff08bc488646602424fbd030bfd097e8cda9.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Web')
| -rw-r--r-- | Zotlabs/Web/Controller.php | 3 |
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 +} + |