From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Wed, 7 Jun 2017 20:32:41 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Tag: v3.0.1~6
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f9a12dfac2941332998cca262de1b2c101e13fe8?hp=6b6aafabcfc96bbf3af083efa659553b5d4a6a45

Merge branch 'master' of https://github.com/Proxmark/proxmark3
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b60b57e..4077d37e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 
 ## [unreleased][unreleased]
 
+### Changed
+
+### Fixed
+
+### Added
+
+## [3.0.0][2017-06-04]
+
 ### Added
 - Added hf mf hardnested, an attack working for hardened Mifare cards (EV1, Mifare Plus SL1) where hf mf nested fails
 - Added experimental testmode write option for t55xx (danger) (marshmellow)