Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs		2019-10-20 22:29:56 +03:00
..
activity_pub	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
admin_api	[#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
auth
channels
common_api	[#1304] Moved remaining fields from User.Info to User.	2019-10-20 13:42:42 +03:00
federator	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
feed	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
mailer
mastodon_api	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
media_proxy
metadata	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
mongooseim
nodeinfo
oauth	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
ostatus	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
pleroma_api/controllers	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
push
rich_media
streamer	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
templates	MastoFE: Add PWA manifest.	2019-10-19 12:15:14 +02:00
twitter_api	[#1304] Moved remaining fields from User.Info to User.	2019-10-20 13:42:42 +03:00
views	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
web_finger	webfinger: stop pulling Salmon data out of WebFinger	2019-10-18 14:50:09 +00:00
xml
chat_channel.ex
controller_helper.ex
endpoint.ex
fallback_redirect_controller.ex
gettext.ex
masto_fe_controller.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
metadata.ex
oauth.ex
rel_me.ex
router.ex	Merge branch 'feature/mastofe-pwa' into 'develop'	2019-10-19 20:11:58 +00:00
translation_helpers.ex
uploader_controller.ex
web.ex