]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Sun, 16 Jan 2022 17:11:20 +0000 (18:11 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Sun, 16 Jan 2022 17:11:20 +0000 (18:11 +0100)
commitb61c3ddff8338432fdc287f6bebbf76a12859c17
tree702e67a92f3a6e84feed3c06126b14a7e4ecab35
parent07cb948f39464b11959fc506b673a90d9524e519
parent462bc65112276f4cbfbeb1efd8cd452fda7d0f23
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.
app/controllers/auth/sessions_controller.rb
app/javascript/mastodon/actions/compose.js
app/models/account.rb
app/models/user.rb
config/environments/production.rb
db/schema.rb