From 7e588480aa1ff37fd2e9a31950458aa99f76d259 Mon Sep 17 00:00:00 2001
From: Isaac Johnston <isaac@superstruct.nz>
Date: Thu, 25 Feb 2021 00:42:35 +1300
Subject: [PATCH] Add docs/releases/2021.md

---
 CHANGELOG.md          |  2 +-
 docs/api-intro.md     |  2 +-
 docs/releases/2021.md | 19 +++++++++++++++++++
 mkdocs.yml            |  3 ++-
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 docs/releases/2021.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf6cbf0e0..a87f4e709 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,2 @@
-The [CHANGELOG has moved here](https://day8.github.io/re-frame/releases/2020).
+The [CHANGELOG has moved here](https://day8.github.io/re-frame/releases/2021).
 
diff --git a/docs/api-intro.md b/docs/api-intro.md
index 89cb04cc5..a1a24f946 100644
--- a/docs/api-intro.md
+++ b/docs/api-intro.md
@@ -9,7 +9,7 @@ In the navigation to the left, you'll see a link to both.
 
 ## Dependency Information 
 
-Please review both the [releases page](http://day8.github.io/re-frame/releases/2020) and the [Clojars page](https://clojars.org/re-frame/) to discover the version you should be using. 
+Please review both the [releases page](http://day8.github.io/re-frame/releases/2021) and the [Clojars page](https://clojars.org/re-frame/) to discover the version you should be using. 
 
 
 ## Using re-frame
diff --git a/docs/releases/2021.md b/docs/releases/2021.md
new file mode 100644
index 000000000..36ac3ac81
--- /dev/null
+++ b/docs/releases/2021.md
@@ -0,0 +1,19 @@
+
+<!-- leave this H1 here. It stops mkdocs putting in a Title at the top.
+     It needs to be at the top of the file otherwise it breaks the 
+     table of contents on the right hand side. -->
+#
+
+> The re-frame [Clojars page](https://clojars.org/re-frame/) contains dependency coordinates for Maven/deps/Lein.
+
+## Unreleased
+
+## 1.2.0 (2021-02-25)
+
+> **IMPORTANT:** If using re-frame-10x you must upgrade to 1.0.0 to use re-frame with reagent 1.0.0!
+
+#### Changed
+
+- Upgrade to [reagent 1.0.0](https://github.com/reagent-project/reagent/blob/master/CHANGELOG.md#100-2020-12-21) which includes [React 17.0.1](https://reactjs.org/blog/2020/10/20/react-v17.html)
+- Upgrade clojure.tools.logging to 1.1.0
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 44633deb7..01fb60738 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -6,7 +6,7 @@ site_url: https://day8.github.io/re-frame/
 repo_name: day8/re-frame
 repo_url: https://github.com/day8/re-frame
 
-copyright: Copyright &copy; 2015-2020 Michael Thompson
+copyright: Copyright &copy; 2015-2021 Michael Thompson
 
 theme:
   name: material
@@ -95,6 +95,7 @@ nav:
     - Builtin Effects: api-builtin-effects.md
     - re-frame.core: api-re-frame.core.md
   - Releases:
+    - 2021: releases/2021.md
     - 2020: releases/2020.md
     - 2019: releases/2019.md
     - 2018: releases/2018.md