KDSBrowne 2b8c9812ee fix merge conflict		2017-04-17 06:34:11 -07:00
..
message-form-actions	Updated icons in the html5 client	2017-03-01 17:03:02 -08:00
component.jsx	fix merge conflict	2017-04-17 06:34:11 -07:00
styles.scss	set chat input color to gray (text-color)	2017-04-11 17:05:10 -04:00