]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Thu, 10 Dec 2020 08:40:09 +0000 (09:40 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Thu, 10 Dec 2020 08:41:49 +0000 (09:41 +0100)
commit7782e4dc0d9db4835c0f57232da9f8676c97d562
treef1f1376074bd3ab6aa42624eabfd8d57a30f9c6b
parentb27d11dd3320cb005561f0bb1b81baecea8a7c43
parent49eb4d4ddf61e25c5aaab89aa630ddd3c7f3c23d
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
app/controllers/about_controller.rb
app/controllers/auth/registrations_controller.rb
app/javascript/packs/public.js
app/models/user.rb