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 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		6 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
v2	…
web	Lint pass (#8876)	6 years ago
base_controller_spec.rb	…
oembed_controller_spec.rb	…
proofs_controller_spec.rb	Add Keybase integration (#10297)	6 years ago
push_controller_spec.rb	…
salmon_controller_spec.rb	rubocop issues - Cleaning up (#8912)	6 years ago
subscriptions_controller_spec.rb	rubocop issues - Cleaning up (#8912)	6 years ago