]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 23 May 2019 17:01:30 +0000 (19:01 +0200)
committerThibaut Girka <thib@sitedethib.com>
Thu, 23 May 2019 17:01:30 +0000 (19:01 +0200)
commitc0dc247bcee9080989d5e5354e54f9d320be1f13
tree708074cbed581c48d619008f8ed58d962e0f15b7
parent0744d6e57186292e751026fbb749728d56a8ed2d
parent89d600bedb023a9656b98d22deab10f8c051a664
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`.
Gemfile
Gemfile.lock
app/controllers/api/v1/notifications_controller.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/pl.json
app/javascript/styles/mastodon/components.scss
package.json
streaming/index.js
yarn.lock