Merge remote-tracking branch 'composer/develop' into develop

Matthias Walter · Matthias Walter · commit 2837e7d6ef9c · 2017-10-27T09:37:01.000+02:00
# Conflicts:
#	CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## next
 
+## 2.2.0
+
 - [FIX] git checkout for tags works again (no longer using Robo to fetch tags)
 - [FEATURE] add composer autoload dump to optimize performance
 
