Thibaut Girka 0158937fc2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Dockerfile
  Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80.
  Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
  The conflict was due to us raising the number of results returned.
  Upstream raised it further, so took it.
- config/locales/de.yml
  Took upstream changes to theme translation strings.
- config/locales/gl.yml
  Took upstream changes to theme translation strings.
- config/locales/nl.yml
  Took upstream changes to theme translation strings.
- config/locales/sk.yml
  Took upstream changes to theme translation strings.
2019-02-26 17:04:44 +01:00
..
2017-05-08 15:56:00 +02:00
2019-01-08 13:39:49 +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-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-20 12:37:58 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00