mastodon-docker-playground/app/javascript/mastodon/features/compose
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
components Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
containers Fix controls for unchangeable properties on status edit not being disabled (#17531) 2022-02-12 19:00:33 +01:00
util Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382) 2021-03-02 12:02:56 +01:00
index.js Fix drawer tab menu routes in advanced web ui (#16793) 2021-09-30 05:19:08 +02:00