mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-12 05:53:14 -08:00
Code Issues Projects Releases Packages Wiki Activity
blueb-Chuckya-fe-standalone/app/javascript/mastodon/features/compose
History
Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
..
components Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +02:00
containers fix isSubmitting prop case (#10785) 2019-05-19 18:41:41 +02:00
util Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
index.js Add forceSingleColumn prop to <UI /> (#10807) 2019-05-23 01:35:22 +02:00