diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-15 21:48:47 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-15 21:48:47 -0400 |
| commit | fc7c4e64ff71bfccdbad763ee60096e3d262d277 (patch) | |
| tree | 69f5ed162b0a848b2f3a08316323d78d1b935479 /Zotlabs/Web/Controller.php | |
| parent | 688171d016412f30a3ed60d4dc70feb64a19621b (diff) | |
| parent | 476116a972c0f8b8ade495de557b8fc8d3097964 (diff) | |
| download | volse-hubzilla-fc7c4e64ff71bfccdbad763ee60096e3d262d277.tar.gz volse-hubzilla-fc7c4e64ff71bfccdbad763ee60096e3d262d277.tar.bz2 volse-hubzilla-fc7c4e64ff71bfccdbad763ee60096e3d262d277.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'Zotlabs/Web/Controller.php')
| -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 +} + |