]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Fri, 24 Nov 2017 01:17:20 +0000 (01:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Fri, 24 Nov 2017 01:17:20 +0000 (01:17 +0000)
1  2 
config/locales/en.yml
config/locales/pl.yml
config/navigation.rb
config/routes.rb
db/schema.rb

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc db/schema.rb
Simple merge