]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'origin/master' into gs-master
authorDavid Yip <yipdw@member.fsf.org>
Fri, 17 Nov 2017 04:52:37 +0000 (22:52 -0600)
committerDavid Yip <yipdw@member.fsf.org>
Fri, 17 Nov 2017 04:52:37 +0000 (22:52 -0600)
commitb28b405b9763a0bb3df653b51e6d084b42e9a54d
treec69f1ccb99440fea8cc94014e77687238e205160
parentee560abdbe7a2caf0f7ac6137faf248bbaff9a93
parentdc6e031364d1f47a49ea47f20070a4e9986a4c68
Merge remote-tracking branch 'origin/master' into gs-master
app/javascript/styles/mastodon/accounts.scss
app/models/account.rb
app/services/batched_remove_status_service.rb
app/views/accounts/_header.html.haml
config/locales/en.yml
config/routes.rb
spec/models/status_spec.rb