diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-22 20:40:04 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-22 20:40:04 +0200 |
| commit | a9eaa780f56d9b10cc7ae9e8134a612cbc96b4f8 (patch) | |
| tree | d41dfb47bc842666ffadc4cb39f0dc9ed22af4fb /app/models/poll_vote.rb | |
| parent | c3fa4e8e07e5bcc685163959833a989fb15e8029 (diff) | |
| parent | fd9f5a467f9af857338380bf78b6b7037a12f171 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc
Diffstat (limited to 'app/models/poll_vote.rb')
0 files changed, 0 insertions, 0 deletions