From 4835e20d1d08203657ab616600286ad9dfd71344 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Wed, 24 May 2017 15:46:44 +0200
Subject: Re-enable PELMO examples and tests

- Add .gitattributes to make sure CRLF line endings are kept for PELMO
.psm files
- Update static docs
---
 ChangeLog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 6f5775d..f749300 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+commit 539ea37b45ddc41b36dd199f06ffe5936ab13f21
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date:   2017-05-17 12:23:38 +0200
+
+    Documentation fix
+
+commit 62bffd4873bc53fa9cd81336efa716b220c83e0a
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date:   2017-05-17 09:36:22 +0200
+
+    Simplify tests where possible
+
 commit d60bb9c0b52c8e0452bfbe507e60d5f651589cc8
 Author: Johannes Ranke <jranke@uni-bremen.de>
 Date:   2017-05-16 18:57:16 +0200
-- 
cgit v1.2.1