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.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
common.js	Avoid loading rails-ujs twice on vanilla flavour	2018-07-16 16:42:52 +02:00
embed.js
mailer.js	Fixed improper mailer import	2018-01-15 21:23:26 -08:00
public.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
settings.js	Restore glitch-soc's 500 characters limit for bios (fixes #625)	2018-08-06 08:20:29 +02:00
theme.yml	Fix mailer to use webpack core	2018-01-15 21:17:03 -08:00