Merge in backpublished 1.9.6 changelog (#97)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3661fe0..b9918d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 1.10.0-nullsafety.7-dev
+
## 1.10.0-nullsafety.6
* Fix bug parsing asynchronous suspension gap markers at the end of stack
@@ -30,6 +32,14 @@
* Opt in to null safety.
+## 1.9.6 (backpublish)
+
+* Fix bug parsing asynchronous suspension gap markers at the end of stack
+ traces. (Also fixed separately in 1.10.0-nullsafety.3)
+* Fix bug parsing asynchronous suspension gap markers at the end of stack
+ traces, when parsing with `Trace.parse` and `Chain.parse`. (Also fixed
+ separately in 1.10.0-nullsafety.6)
+
## 1.9.5
* Parse the format for `data:` URIs that the Dart VM has used since `2.2.0`.
diff --git a/pubspec.yaml b/pubspec.yaml
index 7c0cfff..be5bced 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: stack_trace
-version: 1.10.0-nullsafety.6
+version: 1.10.0-nullsafety.7-dev
description: A package for manipulating stack traces and printing them readably.
homepage: https://github.com/dart-lang/stack_trace
