From c44e52446a864069cdfca7f740c9ecf8140cef43 Mon Sep 17 00:00:00 2001
From: Max Humber <max.humber@gmail.com>
Date: Fri, 7 Oct 2022 14:18:55 -0400
Subject: [PATCH] changelog

---
 CHANGELOG | 8 ++++++++
 TODO      | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 38b0d5d..697f2e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+- 1.2b1
+    - NEW: `cross` join verb!
+    - NEW: `join(..., postfix=("_lhs, "_rhs"))` argument
+    - NEW: `memory` property to check DataFrame memory footprint
+    - NEW: Makefile (for development)
+    - BUGFIX: `combine` drop=True argument now works as intended
+    - BUGFIX: `summarize` deprecation warning now displays properly
+    - BREAKING: `combine` now explicitly requires a `sep` argument
 - 1.1
     - BUMP: Pandas 1.5+
     - NEW: `__dataframe__` interchange format support
diff --git a/TODO b/TODO
index a7f7383..8bc14e8 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,11 @@
+- explode, collapse verbs
 - more research into `.assign` mutate(..., vectorized=True)?
 - datasets
 - .log (Untitled12)
 - .slice
 - .complete
+- .tally?
 - hide/protect/private
 - 10 minutes tutorial
 - cheatsheet (pandas/dplyr/tidyr)
-- stackoverflow blitz
\ No newline at end of file
+- anaconda
\ No newline at end of file