From 784db37f91daeba1d87c867dfdbf77ba778d4e04 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 2 Aug 2020 12:02:56 -0600
Subject: [PATCH] v1.2.0

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5b3eacf..65c34e58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+*Nothing yet.*
+
+## [1.2.0] - August 2nd, 2020
+
 ### Upgrade notes
 
 **This release contains a database change which might take a while.** In order to support quotas, this
@@ -173,7 +177,8 @@ a large database (more than about 100k uploaded files), run the following steps
 * Various other features that would be expected like maximum/minimum size controls, rate limiting, etc. Check out the
   sample config for a better idea of what else is possible.
 
-[unreleased]: https://github.com/turt2live/matrix-media-repo/compare/v1.1.3...HEAD
+[unreleased]: https://github.com/turt2live/matrix-media-repo/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/turt2live/matrix-media-repo/compare/v1.1.3...v1.2.0
 [1.1.3]: https://github.com/turt2live/matrix-media-repo/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/turt2live/matrix-media-repo/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/turt2live/matrix-media-repo/compare/v1.1.0...v1.1.1
-- 
GitLab