Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's
This commit is contained in:
Thibaut Girka 2019-11-07 13:43:56 +01:00
commit 83774367d2
13 changed files with 485 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/styles/mastodon/components.scss
View file

@ -392,6 +392,7 @@
.autosuggest-input,
.spoiler-input {
position: relative;
width: 100%;
}
.spoiler-input {