]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 12 Dec 2019 14:40:06 +0000 (15:40 +0100)
committerThibaut Girka <thib@sitedethib.com>
Thu, 12 Dec 2019 14:40:06 +0000 (15:40 +0100)
commitbe4849c08306cce930ea27e1f8097ffb774f75c6
tree7eb7528245c671cdf908e07c3d630e7639d575bb
parent246addd5b33a172600342af3fb6fb5e4c80ad95e
parentd08a4979462352f83b1deddaa6209f7b6078ed26
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
Gemfile
Gemfile.lock
app/controllers/application_controller.rb
app/javascript/mastodon/features/compose/components/poll_form.js
app/models/media_attachment.rb
package.json
yarn.lock