about summary refs log tree commit diff
path: root/app/javascript/flavours
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-02-26 17:04:44 +0100
committerThibaut Girka <thib@sitedethib.com>2019-02-26 17:04:44 +0100
commit0158937fc2345a83f8ee5a64e85b14cabfe4b1e7 (patch)
tree79872e72c27d6371620c0dd8f04700aa0094020c /app/javascript/flavours
parentd82de360c13894746d3974d11c9505c8937ebdee (diff)
parenta5e7ada62fa2824be158f0b3bed7f3c39ce9c0fa (diff)
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.
Diffstat (limited to 'app/javascript/flavours')
0 files changed, 0 insertions, 0 deletions