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
..
AuthRoutes.js	Fix lint	2017-11-13 10:58:35 -02:00
NavigationService.js	Verify if user has username on login (#64)	2017-11-13 11:35:01 -02:00
PublicRoutes.js	Terms & privacy (#63)	2017-11-13 11:32:46 -02:00