From 60a9467e3d20397836f4cd63827fcc2bee071532 Mon Sep 17 00:00:00 2001
From: Estevao Soares dos Santos <estevao.santos@gmail.com>
Date: Wed, 21 Dec 2016 09:05:52 +0000
Subject: [PATCH] release 1.5.4

---
 CHANGELOG.md         |  11 +++++++++++
 dist/showdown.js     | Bin 72899 -> 72899 bytes
 dist/showdown.min.js | Bin 29666 -> 29666 bytes
 package.json         |   2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51b12f2..599f4a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="1.5.4"></a>
+## [1.5.4](https://github.com/showdownjs/showdown/compare/1.5.3...1.5.4) (2016-12-21)
+
+
+### Bug Fixes
+
+* **horizontal rule:** revert backwards incompatibility change ([113f5f6](https://github.com/showdownjs/showdown/commit/113f5f6)), closes [#317](https://github.com/showdownjs/showdown/issues/317)
+* **simpleLineBreaks:** fix simpleLineBreak option breaking lists html ([ed4c33f](https://github.com/showdownjs/showdown/commit/ed4c33f)), closes [#316](https://github.com/showdownjs/showdown/issues/316)
+
+
+
 <a name="1.5.3"></a>
 ## [1.5.3](https://github.com/showdownjs/showdown/compare/1.5.2...1.5.3) (2016-12-19)
 
diff --git a/dist/showdown.js b/dist/showdown.js
index 6914604b0ee12d87ff9246794e9a84970e5ac61e..c56c613362bed62f2044cff47b16d24393b8ae48 100644
GIT binary patch
delta 30
lcmX@SljZPE76EI0Ek%XmjQsMH{PH{nBg004tpbdjWdNsW3J3rI

delta 30
lcmX@SljZPE76EI0Ek%XmjQsMH{PH{nBZEePtpbdjWdNsO3I_lH

diff --git a/dist/showdown.min.js b/dist/showdown.min.js
index 3269405f55d2a525f2083835e65e541d9eba8543..153b6a51546fd0c7545d1683fea8c6dc36be7921 100644
GIT binary patch
delta 26
hcmaF#obl0fMt*%QMTO#w{PL9i@;n72!;Soxivf|a3P1n=

delta 26
hcmaF#obl0fMt*%QMTO#w{PL9i@;n72gN^)`ivf|V3O@h<

diff --git a/package.json b/package.json
index 513907b..0f9d741 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "showdown",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "A Markdown to HTML converter written in Javascript",
   "author": "Estevão Santos",
   "homepage": "http://showdownjs.github.io/showdown/",