]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 15 Feb 2019 17:02:45 +0000 (18:02 +0100)
committerThibaut Girka <thib@sitedethib.com>
Fri, 15 Feb 2019 17:02:45 +0000 (18:02 +0100)
1  2 
Gemfile
Gemfile.lock
app/controllers/auth/registrations_controller.rb
app/javascript/styles/mastodon/components.scss

diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge