]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Tue, 15 Mar 2022 19:45:27 +0000 (20:45 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Tue, 15 Mar 2022 19:45:27 +0000 (20:45 +0100)
commitc79a03b319e17f5ab8c40d065842607de0d76108
tree71debfede36bf8985cd5e3e37b6107560c358f57
parent80c4db160ecfd201cb82ed320cbe3eb32236ad20
parente798c1c64cf417b88379e1d381592a8920fdeeab
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.
12 files changed:
.github/workflows/build-image.yml
Gemfile
Gemfile.lock
app/controllers/api/v1/notifications_controller.rb
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/models/status.rb
app/views/statuses/_simple_status.html.haml
config/initializers/content_security_policy.rb
lib/mastodon/version.rb
package.json
yarn.lock