=Corey Hulen 554f017327 Fixing merge conflict

2015-09-22 13:20:24 -07:00

..

config_docker.json

Fixing merge conflict

2015-09-22 13:20:24 -07:00

docker-entry.sh

Updating dockerfiles to allow for previewing of latest master and fixing local docker build so it works on osx

2015-08-11 14:07:35 -04:00

Dockerfile

Updating dockerfiles to allow for previewing of latest master and fixing local docker build so it works on osx

2015-08-11 14:07:35 -04:00

Dockerrun.aws.json

Updating dockerfiles to allow for previewing of latest master and fixing local docker build so it works on osx

2015-08-11 14:07:35 -04:00