Merge branch 'release/v1.1'

Signed-off-by: Pedro Correia <[email protected]> Conflicts: README.md
sapo · May 6, 2013 · d61c426 · d61c426
2 parents 9058f80 + 4f80cfa
commit d61c426
Show file tree

Hide file tree

Showing 2 changed files with 595 additions and 1,342 deletions.
diff --git a/README.md b/README.md
@@ -2,19 +2,10 @@
 
 Ink is an interface kit for quick development of web interfaces, simple to use and expand on. It uses a combination of HTML, CSS and JavaScript to offer modern solutions for building layouts, display common interface elements and implement interactive features that are content-centric and user friendly for both your audience and your designers & developers.
 
-## Current Version: 1.0
+## Current Version: 1.1
 
 Although most Ink components are in full working order, some still have a few bugs that are being fixed.
 
-## Repository branches
-
-We have two branches on our github repository:
-
-* The **master** branch contains the latest release as its HEAD and all previous releases as tags.
-* The **develop** branch contains our latest code that will eventually lead to a new release and tag on **master**. This branch is likely to contain code that is not fully functional or documented. Use at your own risk.
-
-To get a specific release clone the repository and use, e.g. "git checkout 1.0.0".
-
 ## Getting started
 
 Let's get you started with Ink right away. Here's what you need to know and do:
@@ -38,4 +29,13 @@ Built with:
 * Ubuntu Font (under [Ubuntu Font License](http://font.ubuntu.com/licence/))
 * HTML5 shiv (under [MIT License](http://opensource.org/licenses/MIT))
 * respond.js (under [MIT License](http://opensource.org/licenses/MIT))
-* normalize.css (under [normalizes license agreement](https://github.com/necolas/normalize.css/blob/master/LICENSE.md))
+* normalize.css (under [normalizes license agreement](https://github.com/necolas/normalize.css/blob/master/LICENSE.md))
+
+## Repository branches
+
+We have two branches on our github repository:
+
+* The **master** branch contains the latest release as its HEAD and all previous releases as tags.
+* The **develop** branch contains our latest code that will eventually lead to a new release and tag on **master**
+
+To get a specific release clone the repository and use, e.g. "git checkout 1.1".