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
..
admin.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
common.js	…
embed.js	…
mailer.js	…
public.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings.js	Restore glitch-soc's 500 characters limit for bios (fixes #625)	6 years ago
theme.yml	…