Merge branch 'master' of github.com:meritoo/common-library

# Conflicts:
#	README.md
This commit is contained in:
Krzysztof Nizioł
2018-09-06 22:01:00 +02:00
119 changed files with 7208 additions and 1621 deletions

View File

@@ -2,7 +2,6 @@
"name": "wiosna-dev/common-library",
"description": "Useful classes, methods, extensions etc.",
"license": "MIT",
"version": "0.0.17",
"authors": [
{
"name": "Meritoo.pl",
@@ -11,10 +10,11 @@
}
],
"require": {
"php": ">=5.5.9",
"php": ">=5.6",
"ext-intl": "*",
"ext-pcre": "*",
"doctrine/orm": "^2.5",
"gedmo/doctrine-extensions": "^2.4",
"symfony/http-foundation": "^3.3"
"gedmo/doctrine-extensions": "^2.4"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.2",