]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'origin/master' into gs-master
authorDavid Yip <yipdw@member.fsf.org>
Tue, 28 Nov 2017 17:45:13 +0000 (11:45 -0600)
committerDavid Yip <yipdw@member.fsf.org>
Tue, 28 Nov 2017 17:45:13 +0000 (11:45 -0600)
commit95c270f5b1ffd328345a7b1223f65876f3d88423
tree621e27e89b238d8806fdd3294009361d0691f49c
parent7463d80ff442833a4ad299460f37c27be9b8cda1
parent15fab79cfa5b732e9d7816f162272d72cf06c733
Merge remote-tracking branch 'origin/master' into gs-master
app/lib/feed_manager.rb
config/locales/en.yml
config/locales/pl.yml
spec/models/concerns/account_interactions_spec.rb
spec/services/notify_service_spec.rb