Merge branch '1.1' into 1.2

UnionOfRAD · Apr 28, 2017 · ae3257f · ae3257f
2 parents 5ac0692 + d99dfdf
commit ae3257f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -23,8 +23,8 @@ php -S 127.0.0.1:8080 -t webroot index.php
 
 You should now be able to see the welcome page by visiting [http://127.0.0.1:8080](http://127.0.0.1:8080).
 
-The manual has more information on [the installation process](http://li3.me/docs/manual/installation) 
-as well as [getting your first project started very quickly](http://li3.me/docs/manual/quickstart).
+The manual has more information on [the installation process](http://li3.me/docs/book/manual/1.x/installation/)
+as well as [getting your first project started very quickly](http://li3.me/docs/book/manual/1.x/quickstart).
 
 ## Copyright & License
 

diff --git a/composer.json b/composer.json
@@ -15,6 +15,6 @@
     "prefer-stable": true,
     "require": {
         "php": ">=5.5.0",
-        "unionofrad/lithium": "1.1.*@dev"
+        "unionofrad/lithium": "^1.1"
     }
 }