]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'origin/master' into merge-upstream
authorDavid Yip <yipdw@member.fsf.org>
Tue, 2 Jan 2018 06:11:41 +0000 (00:11 -0600)
committerDavid Yip <yipdw@member.fsf.org>
Tue, 2 Jan 2018 06:11:41 +0000 (00:11 -0600)
commit54148b9a4a044e2c3ac9bb5eed71edcc0d598907
tree09cc3cd0558f0152ff17b0c48acbf346b8006098
parentfa9b7ece2e521fb4d6b91a95028614ae9b2a58a3
parent764f87695358c06a823a9c9541f2e8fb092de299
Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
app/controllers/authorize_follows_controller.rb
app/controllers/remote_follow_controller.rb
app/controllers/shares_controller.rb
app/javascript/styles/mastodon/components.scss
app/views/layouts/modal.html.haml