]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'origin/master' into merge-upstream
authorDavid Yip <yipdw@member.fsf.org>
Sat, 30 Dec 2017 23:20:07 +0000 (17:20 -0600)
committerDavid Yip <yipdw@member.fsf.org>
Sat, 30 Dec 2017 23:20:07 +0000 (17:20 -0600)
commit4cca1d1e7efce51eecb64489f412a7b8631f0aed
tree5259571423a25c9a478052599c5e3d04db7fc8bd
parente4944d065b6bd6c6718c27700971be832ed4861a
parentf4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
app/controllers/auth/confirmations_controller.rb
app/controllers/application_controller.rb
app/controllers/auth/confirmations_controller.rb
app/models/status.rb
app/models/user.rb
config/locales/en.yml
config/locales/ko.yml
config/routes.rb
config/settings.yml