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
..
createStore.js	Fix lint	2017-11-13 10:58:35 -02:00
meteor-redux.js	sagas	2017-08-17 13:55:47 -03:00
realm.js	Fix room ordering	2017-11-08 18:23:46 -02:00
rocketchat.js	Add servers (#61)	2017-11-13 11:53:45 -02:00