aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2012-09-19 00:10:19 +0200
committerChristian Weiske <cweiske@cweiske.de>2012-09-19 00:10:19 +0200
commit027c801a4dc51db673bcbfcfbd396845f244e357 (patch)
tree4be2941bd3d92d7cd1f07b61fd3c072b0007abe3 /ChangeLog
parent72dac890a041b8261262c7df7d7f8a8a816a146b (diff)
parentd316adab970b993504ba38736a0f8753ef4bb052 (diff)
downloadphorkie-027c801a4dc51db673bcbfcfbd396845f244e357.tar.gz
phorkie-027c801a4dc51db673bcbfcfbd396845f244e357.zip
Merge remote-tracking branch 'jnovack/markdown'
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a9cfc5..1dc1447 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-18 Justin J. Novack <jnovack@gmail.com>
+
+ * Add Markdown as a known file-type.
+
2012-09-17 Justin J. Novack <jnovack@gmail.com>
* Add OpenID authentication