tykayn c1ce0d49c8 Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020		2020-12-24 16:38:36 +01:00
..
_account.html.haml	Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master	2020-07-17 20:49:44 +02:00
index.html.haml	Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master	2020-07-17 20:49:44 +02:00
show.html.haml	Fix admins being able to suspend their instance actor (#14567)	2020-12-15 17:23:58 +01:00