Merge branch 'master' of https://github.com/bakkenbaeck/s10-beehome-display

henkehenke · henkehenke · commit 00a633ab1b4e · 2020-04-29T11:29:24.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,10 @@
 # Changelog
 
-### [UNRELEASED]
+### [1.2.0] 2020-04-29
 #### Changed
 - nametable changes
 - removed ```Display``` from family name, so it doesn't appear twice
+- ```ampersand``` inktraps
 
 ### [1.1.0] 2020-04-28
 #### Added
