kevgliss 9c0f2917ad Merge branch 'master' into ci ...

* master:
  Fixed issue where hardcoded localhost:port combination existed in Javascript, added another step to setup.py 'package' that removes such instances and creates a more agnostic javascript blob.
  Fixing issue where nginx was not sending the right mimetype for CSS files.

Conflicts:
	gulp/build.js

2015-07-20 16:53:58 -07:00

..

build.js

Merge branch 'master' into ci

2015-07-20 16:53:58 -07:00

karma.conf.js

Getting travisCI setup

2015-07-20 16:13:42 -07:00

server.js

Ensuring that we can use the gulp watcher and that fonts are copied over to the tmp dir

2015-07-08 16:34:21 -07:00

watch.js

Ensuring that we can use the gulp watcher and that fonts are copied over to the tmp dir

2015-07-08 16:34:21 -07:00