Merged changes from 1.0

ICanBoogie · Oct 23, 2014 · d55cd68 · d55cd68
2 parents 2cbeab8 + c999a41
commit d55cd68
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -244,17 +244,10 @@ Starting with 1.1.0 the package implements the [JsonSerializable interface][]
 
 ## Installation
 
-The recommended way to install this package is through [composer](http://getcomposer.org/).
-Create a `composer.json` file and run `php composer.phar install` command to install it:
-
-```json
-{
-	"minimum-stability": "dev",
-	"require":
-	{
-		"icanboogie/datetime": "*"
-	}
-}
+The recommended way to install this package is through [Composer]:
+
+```
+$ composer require icanboogie/datetime
 ```
 
 The package [icanboogie/common](https://packagist.org/packages/icanboogie/common) is suggested to
@@ -271,7 +264,7 @@ If the package is not included, `RunTimeException` instances are thrown instead.
 The package is [available on GitHub](https://github.com/ICanBoogie/DateTime), its repository can be
 cloned with the following command line:
 
-	$ git clone git://github.com/ICanBoogie/DateTime.git
+	$ git clone https://github.com/ICanBoogie/DateTime.git
 
 
 
@@ -311,7 +304,7 @@ The package is continuously tested by [Travis CI](http://about.travis-ci.org/).
 
 ## License
 
-ICanBoogie/DateTime is licensed under the New BSD License - See the [LICENSE](https://raw.github.com/ICanBoogie/DateTime/master/LICENSE) file for details.
+ICanBoogie/DateTime is licensed under the New BSD License - See the [LICENSE](LICENSE) file for details.
 
 
 

diff --git a/tests/DateTimeTest.php b/tests/DateTimeTest.php
@@ -1255,3 +1255,4 @@ class MyDateTime extends \ICanBoogie\DateTime
 {
 
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1255,3 +1255,4 @@ class MyDateTime extends \ICanBoogie\DateTime
		{

		}