Klaus 3af281d648 Merge remote-tracking branch 'upstream/master' into merge-master-mconf		2017-07-17 13:33:45 -03:00
..
chat-list-item	Fix merge conflicts	2017-06-05 13:52:46 +00:00
user-list-item	Merge remote-tracking branch 'upstream/master' into merge-master-mconf	2017-07-17 13:33:45 -03:00
component.jsx	Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis	2017-06-20 14:11:19 -03:00
container.jsx	Sending private message	2017-07-12 10:18:26 -03:00
service.js	Merge pull request #4080 from Klauswk/bbb-2x-emoji-messages	2017-07-14 10:39:16 -04:00
styles.scss	fix color contrast issues	2017-07-07 09:11:22 -07:00