From a9eda33db7bbb0789f79b837d8ffe81914d14cb2 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 4 Feb 2016 14:08:29 +1300
Subject: [PATCH] Add changelog for 2.1.1

---
 CHANGELOG.md => changelog.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 rename CHANGELOG.md => changelog.md (90%)

diff --git a/CHANGELOG.md b/changelog.md
similarity index 90%
rename from CHANGELOG.md
rename to changelog.md
index 817efd0..3c7b3a3 100644
--- a/CHANGELOG.md
+++ b/changelog.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.1]
+
+* Converted to PSR-2
+* FIX: remove parameters from function calls
+* Added standard code of conduct
+* Added standard editor config
+* Updated license
+* Added standard gitattributes
+* MINOR: Don't include Hamcrest globally so it doesn't conflict with PHPUnit
+
 ## [2.1.0]
 
 * 3.2 Compatibility