Merge branch 'develop' of https://github.com/friendica/friendica-addons into develop
authorAndy Hee <andy@hubup.pro>
Mon, 12 Feb 2018 11:42:10 +0000 (18:42 +0700)
committerAndy Hee <andy@hubup.pro>
Mon, 12 Feb 2018 11:42:10 +0000 (18:42 +0700)

Trivial merge