Resolved merge conflict by incorporating enterprise support

SidneyNiccolson · Jul 2, 2018 · 2d2adde · 2d2adde
2 parents ee3dab5 + 24d3864
commit 2d2adde
Show file tree

Hide file tree

Showing 8 changed files with 348 additions and 246 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v4.2.0 - 2018-06-28
+
+* Auth: WPA-Enterprise support - EAP-PEAP #226 [majorz]
+
 ## v4.1.2 - 2018-06-11
 
 * Do not fail on systems without systemd #221 [majorz]