move to upstream master now that all pull requests are in for php-rest-service

Edward Rudd

2014-08-21 d385d68bc83057d9cba773beb279c4aad86788e4

 server/composer.json

@@ -1,10 +1,6 @@
{
    "repositories": [{
        "type": "vcs",
        "url": "https://github.com/urkle/php-rest-service"
    }],
    "require": {
        "marcj/php-rest-service": "dev-work"
        "marcj/php-rest-service": "dev-master"
    },
    "autoload": {
        "psr-0": { "": "src/" }