Permalink
Browse files

Merge pull request #36 from WyriHaximus/master

Remove branch-alias definition as per reactphp/react#343
  • Loading branch information...
2 parents 78375df + a366288 commit 09386d03f060b65cb14922e40f573769727be437 @clue clue committed on GitHub Nov 15, 2016
Showing with 3 additions and 7 deletions.
  1. +0 −5 composer.json
  2. +3 −2 composer.lock
View
@@ -17,10 +17,5 @@
"psr-4": {
"React\\ZMQ\\": "src"
}
- },
- "extra": {
- "branch-alias": {
- "dev-master": "0.4-dev"
- }
}
}
View
@@ -1,10 +1,11 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "146bd8e13cdd0e39fbb5dabbec70a259",
+ "hash": "48b3c58344c0106e3a53be02af32cff1",
+ "content-hash": "fd15d9ad7fc4cad4a7d4f1af1588ebef",
"packages": [
{
"name": "evenement/evenement",

0 comments on commit 09386d0

Please sign in to comment.