From b1c71a12847af0c0229f531c06b307816a6da4f1 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Thu, 19 Nov 2020 13:14:52 +0300
Subject: [PATCH] Pull request: all: prepare for v0.104.2
Merge in DNS/adguard-home from prepare-release to master
Squashed commit of the following:
commit cf4cad216fa259b260bc9cfbd99938979b10623c
Merge: 5434ab5c1 4690229d8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 19 13:08:50 2020 +0300
Merge branch 'master' into prepare-release
commit 5434ab5c178942e8db9e99758c86d22e977d092f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 19 13:01:43 2020 +0300
all: prepare for v0.104.2
---
CHANGELOG.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4502a81a..7856c663 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to
## [Unreleased]
+## [v0.104.2] - 2020-11-19
+
### Added
- This changelog :-) (#2294).
@@ -25,3 +27,6 @@ and this project adheres to
- `404 Not Found` errors on the DHCP settings page on *Windows*. The page now
correctly shows that DHCP is not currently available on that OS (#2295).
- Infinite loop in `/dhcp/find_active_dhcp` (#2301).
+
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.2...HEAD
+[v0.104.2]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.1...v0.104.2