Ivan Tashkinov a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex		2019-10-21 11:05:09 +03:00
..
mrf
transmogrifier
views	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-21 11:05:09 +03:00
activity_pub_controller_test.exs
activity_pub_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-21 11:05:09 +03:00
publisher_test.exs
relay_test.exs
transmogrifier_test.exs
utils_test.exs
visibilty_test.exs