diff options
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a6b47b7d8f..31469144e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +<<<<<<< HEAD +======= +## 1.11.0 (2015-12-12) + +(this space intentionally left blank) + +>>>>>>> v1.11.0 ## 1.11.0.pre.2 (2015-12-06) Bugfixes: |