diff options
| author | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
| commit | f95637178671b1aa0648fa506231717229a6cd8f (patch) | |
| tree | fbaa725bcdb88220c5d1e299b338b196822460e5 /config/locales/devise.sc.yml | |
| parent | 2c6fcb9cf8fbb09e900fc3625837529155f98f4f (diff) | |
| parent | db5baf3d1a93cbf6961f721205cff0beaf71bffd (diff) | |
Merge branch 'glitch'
Conflicts: yarn.lock: caniuse-lite has been outdated in upstream for awhile, and we fixed it a few weeks ago in our fork
Diffstat (limited to 'config/locales/devise.sc.yml')
0 files changed, 0 insertions, 0 deletions