Merge branch 'main' of https://github.com/florianbepunkt/timeline

florianbepunkt · Aug 24, 2023 · 962af3b · 962af3b
2 parents 1e9a5c1 + cafee19
commit 962af3b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# [1.1.0](https://github.com/florianbepunkt/timeline/compare/v1.0.6...v1.1.0) (2023-08-24)
+
+
+### Bug Fixes
+
+* revert styles ([61cecc7](https://github.com/florianbepunkt/timeline/commit/61cecc71b68e8383c67b48f867c7795b67067204))
+* ts build ([63a728f](https://github.com/florianbepunkt/timeline/commit/63a728f5745cc9d37ce4e2028041f0d5ba99d4de))
+
+
+### Features
+
+* merge changes from production ([9ed8980](https://github.com/florianbepunkt/timeline/commit/9ed8980f55bcc88b7092fadab6a4a4bf5446b620))
+
 ## [1.0.5](https://github.com/florianbepunkt/timeline/compare/v1.0.4...v1.0.5) (2023-01-30)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@florianbepunkt/timeline",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "An event timeline for React",
   "type": "module",
   "module": "dist/index.js",