You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		7 years ago
..
_account.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	7 years ago
_action_log.html.haml	Improve report layout (#7188)	7 years ago
_report.html.haml	Show remote reports in admin UI as coming from domain rather than user (#7347)	7 years ago
_status.html.haml	Improve admin UI for accounts (#7360)	7 years ago
index.html.haml	Improve report layout (#7188)	7 years ago
show.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago