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 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		6 years ago
..
assets.rake	Override current_user when generating static pages	6 years ago
auto_annotate_models.rake	…
db.rake	…
emojis.rake	Update emoji codepoint mappings to v11.0 (#9618)	6 years ago
glitchsoc.rake	…
mastodon.rake	Add tootctl settings registrations open (#8829)	6 years ago
repo.rake	…
statistics.rake	…