Thibaut Girka c0dc247bce 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`.

2019-05-23 19:01:30 +02:00

..

ISSUE_TEMPLATE

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-22 17:51:38 +02:00

CODEOWNERS

Move files for GitHub to .github directory (#5989)

2017-12-12 15:10:12 +01:00

FUNDING.yml

Add sponsor button to GitHub web UI (#10814)

2019-05-23 15:00:54 +02:00