]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 30 Jun 2020 21:00:20 +0000 (23:00 +0200)
committerThibaut Girka <thib@sitedethib.com>
Tue, 30 Jun 2020 21:00:20 +0000 (23:00 +0200)
commit9c3b9d5ab91874f5bd9b7225c402816676065f00
tree4d1389cc00bcc59f85a6d42c1a49b5c1d50f3b3c
parent10ede3eb27c5de5d4e3a283e333af2a54da6177d
parent65506bac3f3fe233b5b7b3241020bd74eb5c9259
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
Gemfile
Gemfile.lock
app/javascript/styles/mastodon/components.scss
app/models/media_attachment.rb
app/serializers/activitypub/note_serializer.rb
app/views/statuses/_simple_status.html.haml
config/routes.rb
db/schema.rb
package.json
yarn.lock