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
..
admin
settings
application_helper_spec.rb	Add theme identifier to body classes for easier custom CSS styling (#8439)	2018-08-25 22:55:25 +02:00
flashes_helper_spec.rb
home_helper_spec.rb
instance_helper_spec.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	2018-03-04 20:29:49 +01:00
jsonld_helper_spec.rb	Append '.test' to hostname in stub data (#7260)	2018-04-25 14:12:28 +02:00
routing_helper_spec.rb
settings_helper_spec.rb
stream_entries_helper_spec.rb	Display full acct on public status pages, always (#8011)	2018-07-14 04:07:47 +02:00