]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Wed, 9 Dec 2020 13:42:33 +0000 (14:42 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Wed, 9 Dec 2020 13:42:33 +0000 (14:42 +0100)
commita16175645dd9e2abbdf72b5e396fa4c4a74e0ff9
tree2d2d401791d9cab06f3285c7d3172f2223acfee2
parent25f725d67a6d2542cd586ab7c56baca572eb4f88
parent127c543a6e59d20de68e6760e952d18ed53578e9
Merge branch 'master' into glitch-soc/merge-upstream
app/controllers/accounts_controller.rb
app/lib/feed_manager.rb
app/models/account.rb
spec/lib/feed_manager_spec.rb