about summary refs log tree commit diff
path: root/spec/controllers/follower_accounts_controller_spec.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-11-25 15:31:45 +0100
committerThibaut Girka <thib@sitedethib.com>2020-11-25 15:31:45 +0100
commite71b16ae2b5623dc664c79ffa7d96282af662c78 (patch)
treedb77dc96f03d7e9b51e33b379dd1f1b9bebc0343 /spec/controllers/follower_accounts_controller_spec.rb
parent24696458bf22c8529b49f89b2791e3e07583b7e0 (diff)
parent41b38b027396d50cac2cf995f2b5830c2cf592fa (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies.
Diffstat (limited to 'spec/controllers/follower_accounts_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions