Gilmar Quinelato 3abc47b7d4 Fix merge conflicts from 'develop'.		2017-09-01 17:00:31 -03:00
..
CreateChannel.js	Fix merge conflicts from 'develop'.	2017-09-01 17:00:31 -03:00
Photo.js	Show imagem attachments (#20)	2017-08-15 16:28:46 -03:00
Styles.js	Add server change saga (#34)	2017-09-01 16:42:50 -03:00
login.js	Fix merge conflicts from 'develop'.	2017-09-01 17:00:31 -03:00
room.js	Fix merge conflicts from 'develop'.	2017-09-01 17:00:31 -03:00
roomsList.js	Fix merge conflicts from 'develop'.	2017-09-01 17:00:31 -03:00
serverList.js	Fix merge conflicts from 'develop'.	2017-09-01 17:00:31 -03:00
serverNew.js	Fix merge conflicts from 'develop'.	2017-09-01 17:00:31 -03:00