diff options
| author | zotlabs <mike@macgirvin.com> | 2017-06-20 18:39:27 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-06-20 18:39:27 -0700 |
| commit | 99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2 (patch) | |
| tree | 75408410d5e4eb71101924df37b16b8eec864181 /include | |
| parent | 7e4e2f28dbc52316f4cef7c17a7c9e6ec7f607dc (diff) | |
| parent | 76e98091690cf5f2726bf7cefea217d49b23a5b4 (diff) | |
| download | volse-hubzilla-99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2.tar.gz volse-hubzilla-99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2.tar.bz2 volse-hubzilla-99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/channel.php | 3 | ||||
| -rw-r--r-- | include/feedutils.php | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/channel.php b/include/channel.php index 433c7c52c..25e54003a 100644 --- a/include/channel.php +++ b/include/channel.php @@ -2373,5 +2373,6 @@ function anon_identity_init($reqvars) { } return $x[0]; +} + -}
\ No newline at end of file diff --git a/include/feedutils.php b/include/feedutils.php index 759c8a05c..158ecb7a3 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -1744,3 +1744,4 @@ function asencode_person($p) { return $ret; } + |