mastodon/lib/tasks
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
2019-01-02 15:36:53 +01:00
..
assets.rake Override current_user when generating static pages 2018-12-19 20:49:58 +01:00
auto_annotate_models.rake
db.rake Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
emojis.rake Update emoji codepoint mappings to v11.0 (#9618) 2018-12-24 19:12:00 +01:00
glitchsoc.rake
mastodon.rake Add tootctl settings registrations open (#8829) 2018-10-04 16:05:54 +02:00
repo.rake using mailto scheme in AUTHORS.md (#8663) 2018-09-10 02:01:03 +02:00
statistics.rake