]> cat aescling's git repositories - mastodon.git/commitdiff
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)
1  2 
app/views/accounts/_header.html.haml
config/routes.rb
spec/models/follow_request_spec.rb

Simple merge
Simple merge
Simple merge