catstodon/app/views/admin/reports
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.
2018-08-26 14:23:24 +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 Add missing video descriptions (#8416) 2018-08-24 23:55:41 +02:00
index.html.haml Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00