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 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.		4 years ago
..
assets.rake	Override current_user when generating static pages	6 years ago
auto_annotate_models.rake	Add announcements (#12662)	5 years ago
db.rake	Fix low-hanging rubocop gripes (#8458)	6 years ago
emojis.rake	Add border around 🐞 emoji (#14712)	4 years ago
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	7 years ago
mastodon.rake	Fix mastodon:setup choking on env variables containing '%' (#13940)	5 years ago
repo.rake	Add missing locale file for ga and add rake task to check for it (#11813)	5 years ago
statistics.rake	add task to report code statistics (#2489)	8 years ago