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
..
2017-05-08 15:56:00 +02:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-12 17:34:00 +01:00
2019-03-12 17:34:00 +01:00
2019-03-16 11:23:22 +01:00
2019-03-17 16:39:30 +09:00
2019-03-16 11:23:22 +01:00
2018-01-28 22:48:09 +09:00
2017-05-08 15:56:00 +02:00
2018-01-28 22:48:09 +09:00
2017-12-08 01:59:44 +01:00
2018-01-28 22:48:09 +09:00
2018-01-09 20:30:28 +09:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-12 17:34:00 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-12 17:34:00 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-12 17:34:00 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00