From f572515b615ec3e30f735a781a3865c2ac3d1828 Mon Sep 17 00:00:00 2001
From: Alex Ullrich <alex.ullrich@gmail.com>
Date: Tue, 19 Dec 2023 21:31:31 -0500
Subject: [PATCH] prepare 1.18.0 (#232)

---
 CHANGELOG.md | 8 ++++++++
 Makefile     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c81a8569c..5dd2dbc3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,14 @@ Based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 
+## 1.18.0
+
+### Added
+
+* Beta support for TOTP multi-factor authentication (#220, #230, #231)
+* Bump prometheus client to 1.11.1 (#229)
+* Bump golang.org/x/crypto to 0.17.0 (#233)
+
 ## 1.17.1
 
 ### Added
diff --git a/Makefile b/Makefile
index 9c7a3080a..63e7d65e9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ include .env
 ORG := keratin
 PROJECT := authn-server
 NAME := $(ORG)/$(PROJECT)
-VERSION := 1.17.1
+VERSION := 1.18.0
 MAIN := main.go
 
 BIN := $(shell pwd)/bin