]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 30 Oct 2018 16:52:08 +0000 (17:52 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 30 Oct 2018 16:52:08 +0000 (17:52 +0100)
commit1c448d647488dc3dd3b72e9fe15efb971612157c
tree2b31e4ed019a29043aa07d9d95e7f8b64e309bbd
parent7e18e95716052d5566f2e31559cbe4a68268f493
parent66019b0ec4aaa584e58e91583425ed7c0d55c28e
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
Gemfile.lock
app/controllers/auth/sessions_controller.rb
app/services/fan_out_on_write_service.rb
config/locales/oc.yml
lib/mastodon/version.rb
This page took 0.064206 seconds and 3 git commands to generate.