Merge branch 'metricsgraphics'

miglesiasEB · Nov 16, 2014 · 3a16e37 · 3a16e37
2 parents 33e25e2 + 1ab4cb1
commit 3a16e37
Show file tree

Hide file tree

Showing 15 changed files with 29,521 additions and 1,457 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -27,9 +27,9 @@ module.exports = function(grunt) {
       pages: {
         src: [
           'q.min.js',
-          'jquery.min.js',
-          'morris-0.5.1.min.js',
-          'raphael-min.js'
+          'jquery.js',
+          'd3.js',
+          'metricsgraphics.js'
         ],
         dest: 'build/lib.js'
       }

diff --git a/build/build.css b/build/build.css