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
..
assets.rake	Do not fetch environment variables to determine default locale (#6618)	2018-03-04 10:00:46 +01:00
auto_annotate_models.rake	Improve RuboCop rules (compatibility to Code Climate) (#3636)	2017-06-08 13:24:28 +02:00
db.rake	Set snowflake IDs for backdated statuses (#5260)	2017-10-08 17:34:34 +02:00
emojis.rake	Compress and combine emoji data (#5229)	2017-10-06 03:42:34 +02:00
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	2017-12-10 22:49:59 -06:00
mastodon.rake	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)	2018-08-25 13:27:08 +02:00
statistics.rake	add task to report code statistics (#2489)	2017-04-26 18:47:22 +02:00