Merge pull request #24 from php-http/prepare_release

sagikazarmark · sagikazarmark · commit 2f9f6fd29ff8 · 2015-12-15T13:45:48.000+01:00
Prepare stable release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## UNRELEASED
+## 1.0.0 - 2015-12-15
 
 ### Added
 
@@ -12,7 +12,7 @@
 - Message Factory extends Request and Response factories
 
 
-## 1.0.0-rc1 - 2015-12-14
+## 1.0.0-RC1 - 2015-12-14
 
 ### Added
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# HTTP Message Factory
+# PSR-7 Message Factory
 
 [![Latest Version](https://img.shields.io/github/release/php-http/message-factory.svg?style=flat-square)](https://github.com/php-http/message-factory/releases)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.0-dev"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# HTTP Message Factory`
	`1`	`+# PSR-7 Message Factory`
`2`	`2`
`3`	`3`	`[![Latest Version](https://img.shields.io/github/release/php-http/message-factory.svg?style=flat-square)](https://github.com/php-http/message-factory/releases)`
`4`	`4`	`[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)`