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 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		6 years ago
..
assets.rake	Do not fetch environment variables to determine default locale (#6618)	7 years ago
auto_annotate_models.rake	Improve RuboCop rules (compatibility to Code Climate) (#3636)	8 years ago
db.rake	Fix low-hanging rubocop gripes (#8458)	6 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	Move more tasks to tootctl (#8675)	6 years ago
repo.rake	using mailto scheme in AUTHORS.md (#8663)	6 years ago
statistics.rake	add task to report code statistics (#2489)	8 years ago