]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Wed, 6 Dec 2017 20:17:13 +0000 (20:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Wed, 6 Dec 2017 20:17:13 +0000 (20:17 +0000)
1  2 
app/models/account.rb
app/services/post_status_service.rb
app/services/remove_status_service.rb
config/locales/pl.yml

Simple merge
Simple merge
Simple merge
Simple merge