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 b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml		7 years ago
..
authorizations_controller.rb	…
authorized_applications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
tokens_controller.rb	…