diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-22 16:10:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-22 16:10:44 +0100 |
| commit | 9abb227250bd2b377d96626122d431ba30c5f5e0 (patch) | |
| tree | c3072e0098155cbb7b6f86830cfd0b174703f23e /Aptfile | |
| parent | 7115b0b8c99b7e88aee264be75945e592dec33e4 (diff) | |
| parent | cd6d851d83c38c4f160ae939e08a913bd98fbd8f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.
Diffstat (limited to 'Aptfile')
0 files changed, 0 insertions, 0 deletions