Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		2018-05-10 00:03:28 +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	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
_report.html.haml	Show remote reports in admin UI as coming from domain rather than user (#7347)	2018-05-04 13:26:25 +02:00
_status.html.haml	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
index.html.haml	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
show.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-04 09:42:31 -05:00