Update changelog.

9 years ago · 5ee20f7886
parent 9a154725b5
commit 5ee20f7886
1 changed files with 1 additions and 0 deletions
--- a/docs/changelog
+++ b/docs/changelog
@ -2,6 +2,7 @@ Changelog
 ---------

 next:
+	* Core: Fix conflicting requirements (Darko Poljak)
 	* New type: __jail_freebsd9: Handle jail management on FreeBSD <= 9.X (Jake Guffey)
 	* New type: __jail_freebsd10: Handle jail management on FreeBSD >= 10.0 (Jake Guffey)
 	* Type __jail: Dynamically select the correct jail subtype based on target host OS (Jake Guffey)