]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 7 Jul 2020 13:34:00 +0000 (15:34 +0200)
committerThibaut Girka <thib@sitedethib.com>
Tue, 7 Jul 2020 13:58:45 +0000 (15:58 +0200)
commite9ad99bc93b6f65277956d997792ec40f08165cb
treece71714d2d0d680adecf070cb4e698f3a6984b56
parent94e09d309cb068ea92919767e40e655260ac43cb
parent6e25574ce599cbc37b7215ded03c7d07208af6bb
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.
13 files changed:
Gemfile
Gemfile.lock
app/controllers/auth/passwords_controller.rb
app/controllers/auth/registrations_controller.rb
app/controllers/home_controller.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/styles/mastodon/components.scss
app/views/layouts/application.html.haml
config/initializers/content_security_policy.rb
db/schema.rb
package.json
yarn.lock