Gilmar Quinelato 3abc47b7d4 Fix merge conflicts from 'develop'.		2017-09-01 17:00:31 -03:00
..
KeyboardView.js	Components moved to 'containers' or 'presentation' folders.	2017-09-01 16:17:53 -03:00
RoomItem.js	Fix merge conflicts from 'develop'.	2017-09-01 17:00:31 -03:00