• Thibaut Girka's avatar
    Merge branch 'master' into glitch-soc/merge-upstream · 0158937f
    Thibaut Girka authored
    Conflicts:
    - Dockerfile
      Took upstream version and reverted f13ebd02.
      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.
    0158937f
Name
Last commit
Last update
..
assets Loading commit data...
devise Loading commit data...
generators Loading commit data...
json_ld Loading commit data...
mastodon Loading commit data...
paperclip Loading commit data...
tasks Loading commit data...
templates Loading commit data...
cli.rb Loading commit data...