Merge remote-tracking branch 'origin/develop' into staging

sapo · Feb 12, 2015 · dfc6def · dfc6def
2 parents 9d55805 + 13ef2dc
commit dfc6def
Show file tree

Hide file tree

Showing 26 changed files with 934 additions and 982 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Ink",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "An HTML5/CSS3 framework used at SAPO for fast and efficient website design and prototyping.",
   "keywords": [
     "HTML",