Added changelog entries and cleaned up merge

2019-08-21 13:00:51 -07:00
parent ba3cd454ba
commit 697e5df52d
9 changed files with 22 additions and 13 deletions
--- a/packages/types/CHANGELOG.json
+++ b/packages/types/CHANGELOG.json
@@ -9,6 +9,11 @@
            {
                "note": "Add `OrderInfo`, `FillResults`, `MatchedFillResults`, `BatchMatchedFillResults` types",
                "pr": 2031
+            },
+            ,
+            {
+                "note": "Add status types for Staking contracts",
+                "pr": 1910
            }
        ]
    },