Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex		2019-12-04 18:56:31 +03:00
..
mrf	fix credo	2019-11-14 20:18:45 -06:00
transmogrifier	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00
views	[#1304] Merged develop, handled User.Info.invisible.	2019-10-21 11:58:22 +03:00
activity_pub_controller_test.exs	ActivityPub controller: do not render remote users	2019-11-25 17:19:33 +03:00
activity_pub_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
publisher_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
relay_test.exs	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
transmogrifier_test.exs	Merge branch 'feature/move-activity' into 'develop'	2019-12-02 16:26:19 +00:00
utils_test.exs	Support old flag format	2019-11-08 18:21:29 +09:00
visibilty_test.exs	Replace user.following with Pleroma.FollowingRelationship	2019-10-11 02:35:32 +07:00