• Thibaut Girka's avatar
    Merge branch 'master' into glitch-soc/merge-upstream · 66ad30db
    Thibaut Girka authored
    Conflicts:
    - `package.json`:
      No real conflict, upstream updated a dependency which is
      textually adjacent to a glitch-soc-specific dependency.
      Updated it.
    - `yarn.lock`:
      No real conflict, upstream updated a dependency which is
      textually adjacent to a glitch-soc-specific dependency.
      Updated it.
    66ad30db
This project manages its dependencies using Bundler. Learn more
Gemfile 4.47 KB