Merge branch 'release/v0.2.1' into production

FirstLegoLeague · Nov 28, 2014 · 62d2284 · 62d2284
2 parents bcfb0aa + f17d64a
commit 62d2284
Show file tree

Hide file tree

Showing 41 changed files with 11,238 additions and 2,029 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,15 +14,13 @@ src/components/*/*
 !src/components/angular/angular*.js
 !src/components/angular-sanitize/angular-sanitize*.js
 !src/components/angular-mocks/angular*.js
+!src/components/angular-touch/angular*.js
+!src/components/angular-bootstrap/*.js
 
 !src/components/bootstrap-css/css
 !src/components/bootstrap-css/img
 !src/components/bootstrap-css/js
 
-
-!src/components/fastclick/lib
-!src/components/fastclick/lib/fastclick.js
-
 !src/components/font-awesome/css
 !src/components/font-awesome/font
 

diff --git a/bower.json b/bower.json
@@ -22,10 +22,10 @@
     "font-awesome": "~3.2.1",
     "idbwrapper": "~1.3.0",
     "signature-pad": "https://github.com/thomasjbradley/signature-pad/archive/master.zip",
-    "fastclick": "~1.0.2",
     "angular": "~1.2.20",
     "angular-mocks": "~1.2.20",
     "angular-bootstrap": "~0.11.0",
-    "angular-sanitize": "~1.3.3"
+    "angular-sanitize": "~1.3.3",
+    "angular-touch": "~1.3.4"
   }
 }