Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into composer

Conflicts:
	composer.json

Change-Id: Id631f810e3f208ab87bf80ebd4fca13dfebe5556
  • Loading branch information...
commit bdc8552049a96c0d614248201ffc8d835d48643f 2 parents 12e0289 + c94cc23
@zircote authored
Showing with 4 additions and 1 deletion.
  1. +4 −1 composer.json
View
5 composer.json
@@ -1,6 +1,9 @@
{
"name": "zircote/Hal",
"type": "library",
+ "version": "0.1.0",
+ "time" : "2012-04-01",
+ "license" : "Apache2",
"description": "A PHP implementation of HAL http://stateless.co/hal_specification.html",
"keywords": ["Hal", "json", "api", "HATEOAS"],
"homepage": "https://github.com/zircote/Hal/",
@@ -17,4 +20,4 @@
"autoload": {
"psr-0": {"Hal": "library"}
}
-}
+}
Please sign in to comment.
Something went wrong with that request. Please try again.