diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-15 19:15:47 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-15 19:15:47 -0400 |
| commit | f2dda646ecf1d11bf88c085d1174d3c147f799b1 (patch) | |
| tree | c86f59fcca3a84413d77c325be433c4c5ea862e2 /Zotlabs/Module/Wiki.php | |
| parent | 98484f0def82493ff9d45405dadefd141a1b32ba (diff) | |
| parent | 47fc0c79588d55a207dc39ae8062ec55382e2564 (diff) | |
| download | volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.tar.gz volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.tar.bz2 volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Module/Wiki.php')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 1e6446904..f1f7b87b2 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -1,6 +1,6 @@ -<?php +<?php /** @file */ -namespace Zotlabs\Module;/** @file */ +namespace Zotlabs\Module; class Wiki extends \Zotlabs\Web\Controller { |