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

2.9 KiB

Raw Blame History

View Raw