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
..
assets.rake	Do not fetch environment variables to determine default locale (#6618)	6 years ago
auto_annotate_models.rake	Improve RuboCop rules (compatibility to Code Climate) (#3636)	7 years ago
db.rake	Set snowflake IDs for backdated statuses (#5260)	7 years ago
emojis.rake	Compress and combine emoji data (#5229)	7 years ago
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	7 years ago
mastodon.rake	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)	6 years ago
statistics.rake	add task to report code statistics (#2489)	7 years ago