Select Git revision
# Conflicts: # www/js/config.js # www/js/controllers/network-controllers.js # www/js/services/network-services.js
# Conflicts: # www/js/config.js # www/js/controllers/network-controllers.js # www/js/services/network-services.js