Esri/resource-proxy — pull request #35 by jgravois (2014-03-19 20:59:53+00:00)
Title: add support for relative protocol urls in proxy.config

this pull request looks hideous because we're still learning how to make sure we are in sync before committing new changes.

i dont think this should cause any merge conflicts, its just overwriting everything with identical content. if im wrong, please let me know and we can figure out a better approach.

next time, we shouldn't have the same problem.