lain 61097ba6ab Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md		2019-10-06 08:11:47 +00:00
..
activity_pub	Merge branch 'develop' into 'reactions'	2019-10-06 08:11:47 +00:00
admin_api	Fix merge	2019-09-30 19:10:54 +07:00
auth
common_api	Merge branch 'develop' into 'reactions'	2019-10-06 08:11:47 +00:00
instances	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
mastodon_api	Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'	2019-10-06 04:41:06 +00:00
media_proxy	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
metadata
mongooseim
oauth	Send an identifier alongside with error message in OAuthController	2019-10-01 18:10:04 +03:00
ostatus	Merge branch 'features/apc2s-media-upload' into 'develop'	2019-09-30 11:21:49 +00:00
pleroma_api/controllers	Merge branch 'develop' into 'reactions'	2019-10-06 08:11:47 +00:00
plugs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
push	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
rich_media
salmon	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
streamer	tests: streamer: add a test for blocked transitive activities	2019-10-04 15:17:32 +00:00
twitter_api	Fix merge	2019-09-30 19:10:54 +07:00
views	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
web_finger	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
websub	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
fallback_test.exs
federator_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
masto_fe_controller_test.exs	Fix credo warning	2019-10-02 21:12:01 +07:00
node_info_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
rel_me_test.exs
uploader_controller_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00