1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-13 14:18:34 +09:00
YuruToot/app/javascript/mastodon/features/compose
Thibaut Girka 4aa6aba6ee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/services/remove_status_service.rb
  Conflict because we still handle the direct timeline.
  Took upstream changes, with that one extra function call.
- config/locales/ca.yml
  Conflict because theme names were updated.
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/oc.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/pl.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
2019-03-16 20:59:33 +01:00
..
components Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +01:00
containers Add UI for creating polls (#10184) 2019-03-06 04:53:37 +01:00
util Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
index.js Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00