Merge branch 'master' into gh-pages

* master: Added country code as id to all flags Remove version from bower.json Ignoring renamed LICENSE file Renamed LICENCE file to LICENSE
eunarede · Jun 12, 2014 · cce76fa · cce76fa
2 parents d8f53bd + f2617e7
commit cce76fa
Show file tree

Hide file tree

Showing 4 changed files with 250 additions and 251 deletions.
diff --git a/LICENCE → LICENSE b/LICENCE → LICENSE
diff --git a/bower.json b/bower.json
@@ -6,7 +6,7 @@
       "assets",
       "Gruntfile.coffee",
       "index.html",
-      "LICENCE",
+      "LICENSE",
       "package.json"
   ]
 }