Merge branch 'develop' into staging

sapo · Feb 5, 2015 · 9d55805 · 9d55805
2 parents 993a1de + 5ba46af
commit 9d55805
Show file tree

Hide file tree

Showing 149 changed files with 3,652 additions and 1,830 deletions.
diff --git a/README.md b/README.md
@@ -4,15 +4,15 @@ Ink is an interface kit for quick development of web interfaces, simple to use a
 
 Ink is part of [SAPOs Open Source Software initiative](http://oss.sapo.pt).
 
-## Current Version: 3.1.2
+## Current Version: 3.1.3
 
 You can read our full documentation, examples and recipes in http://ink.sapo.pt
 
 ## Getting started
 
 Let's get you started with Ink right away. Here's what you need to know and do:
 
-1. Download the [latest](https://github.com/sapo/Ink/archive/3.1.2.zip) release.
+1. Download the [latest](https://github.com/sapo/Ink/archive/3.1.3.zip) release.
 2. Check the recipes we provide in the ```dist/cookbook``` folder and choose one to start from or use ```quick-start.html``` as a blank slate.
 3. Make sure you have `ink.css`, `ink-ie.css` and `ink.js` included somewhere in the `<head>`.
 4. Add your own css and scripts to carry all your project-specific changes. You can use ```quick-start.css``` from the ```dist/css``` folder. It allready contains the same media queries as Ink.
@@ -171,6 +171,7 @@ Get its source, contribute or report and issue here: **https://github.com/sapo/I
 + [Bower](http://bower.io/)
 
 ## Versions
+* [Ink 3.1.3](https://github.com/sapo/Ink/archive/3.1.3.zip)
 * [Ink 3.1.2](https://github.com/sapo/Ink/archive/3.1.2.zip)
 * [Ink 3.1.1](https://github.com/sapo/Ink/archive/3.1.1.zip)
 * [Ink 3.1.0](https://github.com/sapo/Ink/archive/3.1.0.zip)

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Ink",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "An HTML5/CSS3 framework used at SAPO for fast and efficient website design and prototyping.",
   "keywords": [
     "HTML",
@@ -21,7 +21,7 @@
     "bower-compass-core": ">=0.0.1"
   },
   "devDependencies": {
-    "qunit": "~1.12.0",
+    "qunit": "~1.14.0",
     "sinonjs-built": "~1.8.2",
     "sinon-qunit": "~1.0.0",
     "syn": "fabiosantoscode/syn#7bf76c7d1c872bca9da647add0e517896aae19d5",