Merge branch 'task/4137-add-posts-only-feed' of https://github.com/MrPetovan/friendica into task/4137-add-posts-only-feed

# Conflicts:
#	src/Module/Feed.php
This commit is contained in:
Hypolite Petovan 2017-12-30 00:34:23 -05:00
commit 62391d321b

Diff content is not available