angular/protractor — pull request #844 by elgalu (2014-05-22 20:14:50+00:00)
Title: test(config): added a common configuration environment.js

Sorry about the merge conflict, we seem to be changing the same files today :(