]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Mon, 8 Jan 2018 10:17:15 +0000 (10:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Mon, 8 Jan 2018 10:17:15 +0000 (10:17 +0000)
commitf839ac694c3f8050e4c7ec84884283e35f6ac662
tree68ab420feffbfc99de00d72f2e6b0beae4a7b7a0
parent722b3f567f18ae31b05f320441c73279b4f5ad11
parentdbda87c31f7d7ede7312ba422940841d8c96c171
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
app/views/accounts/_header.html.haml
config/routes.rb
spec/models/follow_request_spec.rb