diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-13 15:50:24 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-13 15:50:24 +0200 |
| commit | 1665b842856811c16b904c3b99be6b141a0e1c7b (patch) | |
| tree | 6fba595782a93008ed3dd6f3ac9e19b7271df6b3 /Vagrantfile | |
| parent | 022006577027ca040f4411489821f2e3311f0db6 (diff) | |
| parent | 5159ba26e485daaeded2288c1b02bd1e516e1ca6 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one. - `yarn.lock`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one.
Diffstat (limited to 'Vagrantfile')
0 files changed, 0 insertions, 0 deletions