Merge branch 'feature/dashboard' into develop

Conflicts: lib/upbeat/www/routes/index.ms lib/upbeat/www/routes/services.ms package.json
minineuron · Sep 11, 2012 · 024fddc · 024fddc
2 parents 7c3452f + bfac4c0
commit 024fddc
Show file tree

Hide file tree

Showing 180 changed files with 18,465 additions and 34,008 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 .DS_Store
+dump.rdb
diff --git a/CHANGELOG.md b/CHANGELOG.md