mastodon/app/controllers/api
Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
2019-04-01 21:28:31 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-01 21:28:31 +02:00
v2 Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 2019-02-26 15:21:36 +01:00
web
base_controller.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
oembed_controller.rb
proofs_controller.rb Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb HTTP signatures (#4146) 2017-07-14 20:41:49 +02:00