]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Wed, 3 Jan 2018 04:17:11 +0000 (04:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Wed, 3 Jan 2018 04:17:11 +0000 (04:17 +0000)
commit933840bebf4ce8f5282c88e8c3e8c1b3675fbf2d
treee1d156a830d9446218ad1f250111dfc32df76961
parentfa768abf5c10eb3469a26347a9fa5ff677b3d394
parent99f962ba731f67050a914bb5b9a245869531ebd1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Gemfile
Gemfile.lock
app/controllers/auth/registrations_controller.rb
app/controllers/statuses_controller.rb
app/javascript/styles/mastodon/components.scss
app/models/user.rb
app/views/layouts/application.html.haml
config/application.rb