diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-06-30 00:42:52 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-06-30 00:42:52 +0200 |
| commit | d1780fb9a4dbf3f458f9634b285294c0d674feb9 (patch) | |
| tree | 56a3e393cae7583d0d790227d6dbd4a528021e15 /app/javascript/locales/locale-data | |
| parent | ff3626269eae9c2d15af4c7f05427c2bfcb065ef (diff) | |
| parent | 7c27ccb8d8fda060f3c5b234f7c81fc29b5fc915 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Removed upstream, while we had a checkbox telling people to check if the issue was present upstream. Removed the file as well.
Diffstat (limited to 'app/javascript/locales/locale-data')
0 files changed, 0 insertions, 0 deletions