Skip to content

Commit

Permalink
Merge branch 'release/2.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
MKodde committed Sep 11, 2018
2 parents 5c42b4c + d30d5de commit 08bf4b7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 2.10.1
* Restore DataExporter repository (thanks @tvdijen for issue 164)

## 2.10.0
**Features & Bugfixes**
* Improved the AccessDenied error page #159
Expand Down
6 changes: 6 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
]
},
"minimum-stability": "stable",
"repositories": [
{
"type": "vcs",
"url": "https://github.com/MKodde/DataExporter.git"
}
],
"require": {
"php": "~5.6|~7.0",
"symfony/symfony": "3.4.*",
Expand Down
10 changes: 5 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 08bf4b7

Please sign in to comment.