Commits

Agustin Griguol committed 46e699b3d3dM
Merge pull request #106 in GPS/gps-operations from feature/gpsDisconnections to develop * commit '290619960de5c2d697878ba68380ed411dd25f96': merge conf.js
Merge pull request #106 in GPS/gps-operations from feature/gpsDisconnections to develop * commit '290619960de5c2d697878ba68380ed411dd25f96': merge conf.js