Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00

..

_account.html.haml

Enable custom emojis in profiles (notes, field values, display names) (#7374)

2018-05-06 11:48:51 +02:00

_action_log.html.haml

…

_report.html.haml

…

_status.html.haml

Improvements to toots display in admin view (#7452)

2018-05-12 17:44:15 +02:00

index.html.haml

…

show.html.haml

…