]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 8 Nov 2020 13:20:35 +0000 (14:20 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sun, 8 Nov 2020 13:20:35 +0000 (14:20 +0100)
commit0437d70628bcd852c303432562c74202554fe9cb
tree27b6ff5abf280517ae6a8abd585f15e02d35fd58
parentcfb16b9b70a50ec5451c9aebb2c35d3a44701311
parent3134691948aeacb16b7386ed77bbea4581beec40
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.
app/controllers/accounts_controller.rb
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/lib/activitypub/adapter.rb
app/models/account.rb
db/schema.rb