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 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.		6 years ago
..
_account.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	6 years ago
_action_log.html.haml	Improve report layout (#7188)	6 years ago
_report.html.haml	Show remote reports in admin UI as coming from domain rather than user (#7347)	6 years ago
_status.html.haml	Add missing video descriptions (#8416)	6 years ago
index.html.haml	Improve report layout (#7188)	6 years ago
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago