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
..
components	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
containers	Fix ctrl+enter not submitting toot when text cursor is composing image description (#8273)	2018-08-18 19:40:35 +02:00
util	Upgrade ESLint to version 4.x (#6276)	2018-01-17 16:57:15 +01:00
index.js	Add aria-label to column regions (#8390)	2018-08-23 17:26:21 +02:00