From 6f1b10119053303b6edf8bb45600a57e28a564f3 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Sun, 1 May 2016 15:07:29 +0100
Subject: [PATCH] Update changelog. Completes #64.

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 2d3c6ee..e323beb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 ## v0.12-dev
  - Implemented delayed indexing (#66)
  - Added the time a page was last modified to the footer (#67)
+ - Added unified diff to edit conflict resolution pages (#64)
 
 ## v0.11