From 02c7770b57d09f3db4268b4be87621c983e333a3 Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Sun, 4 Oct 2015 21:59:09 -0600
Subject: [PATCH] Update change list

---
 dist/CHANGES.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dist/CHANGES.txt b/dist/CHANGES.txt
index c05a94f4b..6a2c201c4 100644
--- a/dist/CHANGES.txt
+++ b/dist/CHANGES.txt
@@ -1,6 +1,11 @@
 CHANGES
 
+<master>
+- New directive 'mime' to customize Content-Type based on file extension
+
+
 0.7.6 (September 28, 2015)
+- Pass in simple Caddyfile as command line arguments
 - basicauth: Support for legacy htpasswd files
 - browse: JSON response with file listing
 - core: Caddyfile as command line argument