Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		2019-03-20 13:54:00 +01:00
..
v1
v2
web
base_controller.rb
oembed_controller.rb	Update status embeds (#4742)	2017-08-30 10:23:43 +02:00
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