]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'origin/master' into merge-upstream
authorDavid Yip <yipdw@member.fsf.org>
Fri, 17 Nov 2017 23:40:00 +0000 (17:40 -0600)
committerDavid Yip <yipdw@member.fsf.org>
Fri, 17 Nov 2017 23:40:00 +0000 (17:40 -0600)
commit1ab12ba38ebd42be93b63b7cf0d3c6a81060b741
tree3899389c63c16e33dd48fadb270d3259a7c15b67
parent6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25
parent24cafd73a2b644025e9aeaadf4fed46dd3ecea4d
Merge remote-tracking branch 'origin/master' into merge-upstream
14 files changed:
app/lib/feed_manager.rb
app/models/account.rb
app/models/follow.rb
app/models/follow_request.rb
app/models/media_attachment.rb
app/models/status.rb
app/models/stream_entry.rb
app/services/batched_remove_status_service.rb
app/services/fan_out_on_write_service.rb
app/services/remove_status_service.rb
config/routes.rb
db/schema.rb
spec/lib/feed_manager_spec.rb
streaming/index.js