diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-27 04:00:10 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-27 04:00:10 -0700 |
| commit | 85d2ad4aea106417dc3d8ce2429d13dd858c5201 (patch) | |
| tree | 72e03b3fe379829a4e2f9c521366fb14e1eaa970 /Zotlabs/Web/Controller.php | |
| parent | d5d5d78e3aded9a3238ccb7e93b4c6fd4b873331 (diff) | |
| parent | 8d298d5a068845856c9827c0d2ea3f02f1399d72 (diff) | |
| download | volse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.tar.gz volse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.tar.bz2 volse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.zip | |
Merge branch 'dev' into perms
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 +} + |