Merged branch master into master
.idea/CNinno2k16.iml
0 → 100644
.idea/modules.xml
0 → 100644
.idea/vcs.xml
0 → 100644
.idea/workspace.xml
0 → 100644
This diff is collapsed.
... | ... | @@ -27,7 +27,8 @@ |
"symfony/polyfill-apcu": "^1.0", | ||
"sensio/distribution-bundle": "^5.0", | ||
"sensio/framework-extra-bundle": "^3.0.2", | ||
"incenteev/composer-parameter-handler": "^2.0" | ||
"incenteev/composer-parameter-handler": "^2.0", | ||
"Wantlet": "dev-master" | ||
}, | ||
"require-dev": { | ||
"sensio/generator-bundle": "^3.0", | ||
... | ... | @@ -60,5 +61,12 @@ |
"file": "app/config/parameters.yml" | ||
}, | ||
"branch-alias": null | ||
} | ||
}, | ||
"repositories": [ | ||
{ | ||
"type": "vcs", | ||
"url": "https://github.com/jhartikainen/doctrine2-spatial", | ||
"comment": "Doctrine Spatial Data Types" | ||
} | ||
] | ||
} |
This diff is collapsed.