diff options
author | zotlabs <mike@macgirvin.com> | 2017-03-19 15:44:59 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-03-19 15:44:59 -0700 |
commit | be10bf2cebd5d3ee449901cbf6814bf9a284bd10 (patch) | |
tree | d6aa45e67f9afb282b8e6ec23cc5ebf370ef5ce4 /Zotlabs/Module | |
parent | b0b96daec0deb707b2b5fed5f50c4c24bbed8e25 (diff) | |
parent | d2c971eda99fadb7515fb1e1ea4bd645a52513bd (diff) | |
download | volse-hubzilla-be10bf2cebd5d3ee449901cbf6814bf9a284bd10.tar.gz volse-hubzilla-be10bf2cebd5d3ee449901cbf6814bf9a284bd10.tar.bz2 volse-hubzilla-be10bf2cebd5d3ee449901cbf6814bf9a284bd10.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r-- | Zotlabs/Module/Settings/Permcats.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Settings/Permcats.php b/Zotlabs/Module/Settings/Permcats.php index 771e76cbd..336f69653 100644 --- a/Zotlabs/Module/Settings/Permcats.php +++ b/Zotlabs/Module/Settings/Permcats.php @@ -112,4 +112,4 @@ class Permcats { return $o; } -}
\ No newline at end of file +} |