Ivan Tashkinov 5992382cf8 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/mix/tasks/pleroma/database.ex # lib/pleroma/web/templates/feed/feed/_activity.rss.eex		2021-02-11 19:31:57 +03:00
..
_activity.atom.eex	Revert "Merge branch 'features/hashtag-column' into 'develop'"	2020-12-28 12:02:16 +00:00
_activity.rss.eex	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-02-11 19:31:57 +03:00
_author.atom.eex	adding rss for user feed	2020-03-16 12:45:31 +03:00
_author.rss.eex	adding rss for user feed	2020-03-16 12:45:31 +03:00
_tag_activity.atom.eex	Revert "Merge branch 'features/hashtag-column' into 'develop'"	2020-12-28 12:02:16 +00:00
_tag_activity.xml.eex	fix for use of published from different entities	2020-04-16 18:05:36 +03:00
_tag_author.atom.eex	added atom feed	2020-01-24 22:12:23 +03:00
tag.atom.eex	added atom feed	2020-01-24 22:12:23 +03:00
tag.rss.eex	added atom feed	2020-01-24 22:12:23 +03:00
user.atom.eex	adding rss for user feed	2020-03-16 12:45:31 +03:00
user.rss.eex	adding rss for user feed	2020-03-16 12:45:31 +03:00