Egor Kislitsyn 0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account		2019-04-11 15:51:52 +07:00
..
activity_pub	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-11 15:51:52 +07:00
admin_api	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-11 15:51:52 +07:00
auth	[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.	2019-04-07 11:08:37 +03:00
channels
common_api	Merge branch 'develop' into feature/user-status-subscriptions	2019-04-10 10:44:54 +01:00
federator
http_signatures
mastodon_api	Merge branch 'develop' into feature/user-status-subscriptions	2019-04-10 10:44:54 +01:00
media_proxy
metadata	Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi	2019-04-05 15:19:44 +03:00
nodeinfo
oauth	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-04-08 12:20:26 +03:00
ostatus
push	fix credo	2019-04-05 19:46:28 +07:00
rich_media
salmon
templates	[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.	2019-04-07 11:08:37 +03:00
twitter_api	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-11 15:51:52 +07:00
views
web_finger
websub
xml
chat_channel.ex
controller_helper.ex
endpoint.ex	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-04-08 12:20:26 +03:00
gettext.ex
metadata.ex
oauth.ex
rel_me.ex
router.ex	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-11 15:51:52 +07:00
streamer.ex
uploader_controller.ex
web.ex