Rodrigo Nascimento 6c4cef143d Merge remote-tracking branch 'origin/develop' into update ... # Conflicts: # app/views/LoginView.js # app/views/RegisterView.js		2017-11-13 12:56:57 -02:00
..
CreateChannelView.js	Init support to iPhone X	2017-11-13 10:49:19 -02:00
ForgotPasswordView.js	Fix lint	2017-11-13 10:58:35 -02:00
ListServerView.js	Init support to iPhone X	2017-11-13 10:49:19 -02:00
LoginView.js	Merge remote-tracking branch 'origin/develop' into update	2017-11-13 12:56:57 -02:00
NewServerView.js	Logout (#60)	2017-11-07 18:25:04 -02:00
Photo.js	Fix lint	2017-11-13 10:58:35 -02:00
PrivacyPolicyView.js	Terms & privacy (#63)	2017-11-13 11:32:46 -02:00
RegisterView.js	Merge remote-tracking branch 'origin/develop' into update	2017-11-13 12:56:57 -02:00
RoomView.js	Init support to iPhone X	2017-11-13 10:49:19 -02:00
RoomsListView.js	Init support to iPhone X	2017-11-13 10:49:19 -02:00
SelectUsersView.js	Fix lint	2017-11-13 10:58:35 -02:00
Styles.js	Forgot my password (#62)	2017-11-10 11:42:02 -02:00
TermsServiceView.js	Terms & privacy (#63)	2017-11-13 11:32:46 -02:00