From 5f32640060fef961d700e04fd64ea4c644d02b29 Mon Sep 17 00:00:00 2001
From: Jamie Wong <jamie.lf.wong@gmail.com>
Date: Sun, 25 Oct 2020 01:50:28 -0700
Subject: [PATCH] 1.11.1

---
 CHANGELOG.md | 7 ++++++-
 package.json | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53b5dca9d..678dafd49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
-## Unreleased
+## [1.11.1] - 2020-10-25
+
+### Fixed
+
+- Fix trace-event import for many cases where there are 'ts' collisions [[#322](https://github.com/jlfwong/speedscope/pull/322)]
+- Fix import of trace event files where B/E events' args don't match [[#321](https://github.com/jlfwong/speedscope/pull/321)]
 
 ## [1.11.0] - 2020-10-13
 
diff --git a/package.json b/package.json
index 0b90ad9e7..e2a14c992 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "speedscope",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "",
   "repository": "jlfwong/speedscope",
   "main": "index.js",