]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 5 Jul 2020 17:35:56 +0000 (19:35 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sun, 5 Jul 2020 17:35:56 +0000 (19:35 +0200)
commit2d8be0a6e1fbe9da892937b05b373ab907d89b77
tree73eb669adcc8b13c63dded5a887cb5ecc817894d
parent9b3677d5097fb50f90a6abdce9d722e81d2db469
parent99f3a5554074d9a12619797c474b3de4c6085f02
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `.env.production.sample`:
  Upstream changed it completely.
  Changed ours to merge upstream's new structure, but
  keeping most of the information.
.env.production.sample
Gemfile
Gemfile.lock
app/javascript/mastodon/locales/en.json
app/javascript/styles/mastodon/components.scss
app/models/media_attachment.rb
app/views/statuses/_simple_status.html.haml