diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-17 10:58:25 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-17 10:58:44 +0100 |
| commit | f224237862b009ad4b008a8730c58111f103145b (patch) | |
| tree | 097c08663c6348914fdf95d2ac9ce57ee2a3307c /Aptfile | |
| parent | ec4f9066189fbab4368a275e9cd654dc7ad48217 (diff) | |
| parent | ac99f586bb4138e083676579097d951434e90515 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.
Diffstat (limited to 'Aptfile')
| -rw-r--r-- | Aptfile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Aptfile b/Aptfile index b2cbad714..9235141ad 100644 --- a/Aptfile +++ b/Aptfile @@ -4,10 +4,8 @@ libicu-dev libidn11 libidn11-dev libpq-dev -libprotobuf-dev libxdamage1 libxfixes3 -protobuf-compiler zlib1g-dev libcairo2 libcroco3 |