diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-18 17:25:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-18 17:25:56 +0200 |
| commit | 5cadb4723832b91068ee51955b9d4b1336502369 (patch) | |
| tree | 2e915e53ee0d25ea63ee3910ae8ced44f3295e21 /.nvmrc | |
| parent | ab646fac5f582fe9bef22d8b9a4995fbb4b42d7d (diff) | |
| parent | d0c2c5278391b82ba7fa2f230bf237805ff61a0c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code
Diffstat (limited to '.nvmrc')
0 files changed, 0 insertions, 0 deletions