From 78fbcd9e33a8f83cdc5099cd090498ca1eeca527 Mon Sep 17 00:00:00 2001
From: adrianeboyd <adrianeboyd@gmail.com>
Date: Mon, 27 Aug 2018 15:29:59 +0200
Subject: [PATCH] Update README and CHANGELOG for v1.1

---
 CHANGELOG.md | 2 +-
 README.md    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 356ea8c..9a41027 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ merlin-annis, merlin-exmaralda, merlin-paula, merlin-solr, merlin-text:
 
 - corrected garbled TH1s for German texts 1061_0120358 and 1061_0120440
 
-merlin-annotationscheme, merlin-metadata, merlin-tasks:
+merlin-docs, merlin-metadata, merlin-tasks:
 
 - version bump without changes
 
diff --git a/README.md b/README.md
index 12a1a3b..384851e 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,8 @@ Not included:
 
 **Contact:** info@merlin-platform.eu
 
+**Changelog:** [CHANGELOG](CHANGELOG.md)
+
 ## Description
 
 The MERLIN corpus is a written learner corpus for Czech, German, and 
-- 
GitLab