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
..
controllers	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
views	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
mastodon_api.ex	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00
websocket_handler.ex	Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex	2019-10-18 04:36:37 +00:00