Merge branch 'develop'

This commit is contained in:
Alejandro Celaya 2017-10-24 17:45:54 +02:00
commit 482b792adf
2 changed files with 28 additions and 0 deletions

24
.gitattributes vendored Normal file
View File

@ -0,0 +1,24 @@
/data/infra export-ignore
/docs export-ignore
/module/CLI/test export-ignore
/module/CLI/test-resources export-ignore
/module/Common/test export-ignore
/module/Common/test-func export-ignore
/module/Core/test export-ignore
/module/Core/test-func export-ignore
/module/Rest/test export-ignore
.env.dist export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.phpstorm.meta.php export-ignore
.scrutinizer.yml export-ignore
.travis.yml export-ignore
build.sh export-ignore
CHANGELOG.md export-ignore
docker-compose.override.yml.dist export-ignore
docker-compose.yml export-ignore
func_tests_bootstrap.php export-ignore
indocker export-ignore
phpcs.xml export-ignore
phpunit.xml.dist export-ignore
phpunit-func.xml export-ignore

View File

@ -1,5 +1,9 @@
## CHANGELOG ## CHANGELOG
### 1.6.1
* Added gitattributes file to avoid files not needed in production to be included in distribution
### 1.6.0 ### 1.6.0
**Features** **Features**