]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 7 Nov 2019 12:43:56 +0000 (13:43 +0100)
committerThibaut Girka <thib@sitedethib.com>
Thu, 7 Nov 2019 12:43:56 +0000 (13:43 +0100)
commit83774367d25fd5ad3f9a7b103bea30c13c9e03d8
tree4358e66ceae8a3497ee62e3ec6b8a47b6fb26a8a
parentdd2ec970dbe39f09d3da32d6a8f524aaad68a9d6
parent514e427bd2877e53323791797f508d4ab5007396
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's
app/javascript/mastodon/features/compose/components/poll_form.js
app/javascript/styles/mastodon/components.scss
package.json
yarn.lock