diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-12-18 16:55:15 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-18 16:55:15 +0100 |
| commit | 034ffc079e40e0c723173b5998242803cc28dc50 (patch) | |
| tree | fee1b208be2068cf372ab23f268a66ca51cc2dc3 /app/javascript/flavours/glitch/features/video | |
| parent | 36d27e289177fdec5332539c94b8192022a412f2 (diff) | |
| parent | 5bf100f87be571e86305f3ab244183fc46f1ede2 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.
Diffstat (limited to 'app/javascript/flavours/glitch/features/video')
0 files changed, 0 insertions, 0 deletions