]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 12 Nov 2020 21:13:57 +0000 (22:13 +0100)
committerThibaut Girka <thib@sitedethib.com>
Thu, 12 Nov 2020 21:13:57 +0000 (22:13 +0100)
commitc077cdaba70eac154909cad412ece409acc2e688
tree7d13d319ce62475de15014406635f32a8742ca4b
parent67125534bc0fd48a45d6cb17a5c78712d8e87150
parent9870b175b477bbc984fc7945f1ebe07e3f2b0053
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly.
Gemfile
Gemfile.lock
app/controllers/relationships_controller.rb
app/helpers/application_helper.rb
app/javascript/mastodon/actions/compose.js
app/javascript/styles/mastodon/components.scss
app/views/relationships/show.html.haml
package.json
yarn.lock