]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Sun, 7 Jan 2018 15:17:13 +0000 (15:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Sun, 7 Jan 2018 15:17:13 +0000 (15:17 +0000)
1  2 
app/controllers/application_controller.rb