Merge pull request #4 from jepefe/master

An import of all instanttim changes and fixes from before this project was on github
jepefe · Jan 20, 2014 · e355081 · e355081
2 parents a01550e + ad2ca33
commit e355081
Show file tree

Hide file tree

Showing 128 changed files with 16,504 additions and 17,638 deletions.
diff --git a/Web Server/config/labels.sample.js b/Web Server/config/labels.sample.js
diff --git a/Web Server/css/monitormate.css b/Web Server/css/monitormate.css
diff --git a/Web Server/flot/CONTRIBUTING.md b/Web Server/flot/CONTRIBUTING.md