Merge branch 'combined' of github.com:prantlf/dayjs into combined

prantlf · Oct 14, 2018 · c66b4d9 · c66b4d9
2 parents 386e641 + 6d6e7f5
commit c66b4d9
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.12.1](https://github.com/prantlf/dayjs/compare/v1.12.0...v1.12.1) (2018-10-14)
+
+
+### Bug Fixes
+
+* Correct upgrading from the improved locale format to the ultimate one ([e1a290e](https://github.com/prantlf/dayjs/commit/e1a290e))
+
 # [1.12.0](https://github.com/prantlf/dayjs/compare/v1.11.2...v1.12.0) (2018-10-14)