diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-06-30 23:00:20 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-30 23:00:20 +0200 |
| commit | 9c3b9d5ab91874f5bd9b7225c402816676065f00 (patch) | |
| tree | 4d1389cc00bcc59f85a6d42c1a49b5c1d50f3b3c /config/locales/doorkeeper.hr.yml | |
| parent | 10ede3eb27c5de5d4e3a283e333af2a54da6177d (diff) | |
| parent | 65506bac3f3fe233b5b7b3241020bd74eb5c9259 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.
Diffstat (limited to 'config/locales/doorkeeper.hr.yml')
0 files changed, 0 insertions, 0 deletions