diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-23 19:01:30 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-23 19:01:30 +0200 |
| commit | c0dc247bcee9080989d5e5354e54f9d320be1f13 (patch) | |
| tree | 708074cbed581c48d619008f8ed58d962e0f15b7 /public/emoji/1f926-200d-2642-fe0f.svg | |
| parent | 0744d6e57186292e751026fbb749728d56a8ed2d (diff) | |
| parent | 89d600bedb023a9656b98d22deab10f8c051a664 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.
Diffstat (limited to 'public/emoji/1f926-200d-2642-fe0f.svg')
0 files changed, 0 insertions, 0 deletions