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
..
2019-02-02 12:25:04 +01:00
2019-02-02 12:25:04 +01:00
2018-09-29 19:03:33 +02:00
2019-02-02 19:11:38 +01:00
2018-08-29 21:13:49 +02:00