Klaus Klein 3ac33c79d6 Fix merge algoritm problem		2017-04-12 09:03:14 -03:00
..
message-form	fix merge conflict	2017-04-06 07:11:57 -07:00
message-list	Merge branch 'master' into FixPrivateOfflineChatProblem	2017-04-12 08:33:07 -03:00
notification	adds settings service	2017-03-28 15:41:48 -03:00
component.jsx	update chat unless user just left	2017-04-06 17:08:20 -04:00
container.jsx	Fix merge algoritm problem	2017-04-12 09:03:14 -03:00
service.js	Fix merge algoritm problem	2017-04-12 09:03:14 -03:00
styles.scss	HTML5 - changed variable name	2017-03-16 15:39:34 -07:00