Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex		2019-10-23 17:22:42 +03:00
..
activity_pub	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-23 17:22:42 +03:00
admin_api	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
auth	…
common_api	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
feed	…
instances	…
mastodon_api	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-23 17:22:42 +03:00
media_proxy	…
metadata	…
mongooseim	…
oauth	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
ostatus	tests: ostatus controller tests: fix sporadic compilation failure	2019-10-19 23:16:15 +00:00
pleroma_api/controllers	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation	2019-10-20 22:29:56 +03:00
plugs	…
push	Spelling	2019-10-21 18:35:43 -05:00
rich_media	…
streamer	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
twitter_api	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
views	…
web_finger	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
fallback_test.exs	…
federator_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
masto_fe_controller_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
node_info_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
rel_me_test.exs	…
uploader_controller_test.exs	…