lemur

Commit Graph

Author	SHA1	Message	Date
kevgliss	a826bd16f7	Pleasing the JSHint gods	2015-07-21 13:36:03 -07:00
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

Author

SHA1

Message

Date

kevgliss

a826bd16f7

Pleasing the JSHint gods

2015-07-21 13:36:03 -07:00

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

2 Commits