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 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		6 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
v2	…
web	…
base_controller.rb	Allow mods to disable login, improve message when login disabled (#8329)	6 years ago
oembed_controller.rb	…
push_controller.rb	…
salmon_controller.rb	…
subscriptions_controller.rb	…