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 /app/serializers/rest/instance_serializer.rb | |
| 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 'app/serializers/rest/instance_serializer.rb')
0 files changed, 0 insertions, 0 deletions