diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-08 14:20:35 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-08 14:20:35 +0100 |
| commit | 0437d70628bcd852c303432562c74202554fe9cb (patch) | |
| tree | 27b6ff5abf280517ae6a8abd585f15e02d35fd58 /boxfile.yml | |
| parent | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (diff) | |
| parent | 3134691948aeacb16b7386ed77bbea4581beec40 (diff) | |
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.
Diffstat (limited to 'boxfile.yml')
0 files changed, 0 insertions, 0 deletions