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
..
2018-12-01 17:39:13 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-26 17:04:44 +01:00
2019-02-23 18:41:28 +01:00
2019-02-26 17:04:44 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-26 17:04:44 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-26 17:04:44 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2018-07-24 20:47:13 +02:00
2018-05-07 01:34:19 +02:00
2018-07-11 01:14:38 +02:00
2018-08-31 04:28:29 +02:00
2018-07-11 01:14:38 +02:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2018-08-18 01:00:01 +09:00
2019-02-23 18:41:28 +01:00
2019-01-08 14:09:57 +01:00
2018-12-22 23:32:00 +01:00
2018-09-02 03:14:46 +02:00
2018-05-10 14:48:26 +02:00
2019-02-11 07:41:35 +01:00
2018-09-02 18:20:26 +02:00
2018-05-03 15:54:10 +02:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00
2019-02-23 18:41:28 +01:00