kaniini 1d531fd2f3 Merge branch 'fix/mastodon-api-settings' into 'develop' ... Fix put_settings and remove info_changeset See merge request pleroma/pleroma!507		2018-12-06 16:01:58 +00:00
..
activity_pub	Merge branch 'correct-and-improve-http-options' into 'develop'	2018-12-06 15:57:56 +00:00
admin_api
channels
common_api
federator
http_signatures
mastodon_api	Merge branch 'fix/mastodon-api-settings' into 'develop'	2018-12-06 16:01:58 +00:00
media_proxy
nodeinfo
oauth
ostatus
push	use User.avatar_url	2018-12-06 20:55:46 +07:00
salmon
templates
twitter_api	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 20:15:16 +07:00
views
web_finger
websub
xml
chat_channel.ex
endpoint.ex
gettext.ex
router.ex	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 20:15:16 +07:00
streamer.ex
web.ex