rinpatch ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop' ... Admin API: Return total for reports See merge request pleroma/pleroma!1628		2019-09-17 19:09:56 +00:00
..
activity_pub	Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'	2019-09-17 17:16:39 +00:00
admin_api	Merge branch 'develop' into feature/return-total-for-reports	2019-09-16 14:40:17 +03:00
auth
channels
common_api
federator
mailer
mastodon_api	Revert "Merge branch 'revert-4fabf83a' into 'develop'"	2019-09-16 17:55:04 +07:00
media_proxy
metadata
mongooseim
nodeinfo
oauth
ostatus
pleroma_api
push
rich_media	added prepare html for RichMedia.Parser	2019-09-15 14:53:58 +03:00
salmon
streamer	remove remaining errors from tests	2019-09-17 14:44:52 +00:00
templates
twitter_api	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-09-14 16:11:44 +03:00
views	Revert "Merge branch 'revert-4fabf83a' into 'develop'"	2019-09-16 17:55:04 +07:00
web_finger
websub
xml
chat_channel.ex
controller_helper.ex
endpoint.ex
fallback_redirect_controller.ex
gettext.ex
metadata.ex
oauth.ex
rel_me.ex
router.ex	Merge branch 'develop' into feature/delivery-tracking	2019-09-13 19:42:53 +03:00
translation_helpers.ex
uploader_controller.ex
web.ex