lain 229acae6c3 Merge branch 'develop' into '2435-list-multiple-users' ... # Conflicts: # CHANGELOG.md		2021-01-26 14:24:32 +00:00
..
controllers	Merge branch 'develop' into '2435-list-multiple-users'	2021-01-26 14:24:32 +00:00
views	Merge branch 'fix/missing-own_votes' into 'develop'	2021-01-26 00:55:05 +00:00
masto_fe_controller_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
mastodon_api_controller_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
mastodon_api_test.exs	Change user.deactivated field to user.is_active	2021-01-15 11:24:46 -06:00
update_credentials_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00