]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Sun, 17 Dec 2017 03:17:14 +0000 (03:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Sun, 17 Dec 2017 03:17:14 +0000 (03:17 +0000)
1  2 
config/application.rb

Simple merge