namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/javascript/mastodon/features/compose
History
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
2019-05-10 17:09:12 +02:00
..
components Merge branch 'master' into glitch-soc/merge-upstream 2019-05-10 17:09:12 +02:00
containers Add emoji suggestions to CW and poll option fields (#10555) 2019-05-09 22:10:27 +02: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