• Thibaut Girka's avatar
    Merge branch 'master' into glitch-soc/merge-upstream · 36393e1d
    Thibaut Girka authored
    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.
    36393e1d