Merge remote-tracking branch 'jnovack/markdown'
authorChristian Weiske <cweiske@cweiske.de>
Tue, 18 Sep 2012 22:10:19 +0000 (00:10 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Tue, 18 Sep 2012 22:10:19 +0000 (00:10 +0200)
Conflicts:
ChangeLog

1  2 
ChangeLog
README.rst
data/config.default.php

diff --cc ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
+ 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
 +
  2012-09-16  Christian Weiske  <cweiske@cweiske.de>
  
        * Implement request #12: DOAP documents for all pastes
diff --cc README.rst
Simple merge
Simple merge