diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 12:06:58 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 12:06:58 +0100 |
| commit | d8fdbb054e30f6e8e505bce63e5f150bf117cd8e (patch) | |
| tree | 0a671ee6c8a7644e6613dd87798f661f4703e8fe /bin | |
| parent | 4aa860b65bd796b09dc0ceffa1fdd7de31060a34 (diff) | |
| parent | 65db2625508c220fd3c0a1f37cdd2e13b6e02987 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions