From 7d5693421fa3d95a17024486954e50dfcbf48d34 Mon Sep 17 00:00:00 2001
From: mustafahlvc <mustafahlvc@gmail.com>
Date: Wed, 30 Aug 2017 15:11:21 +0300
Subject: [PATCH] Merge branch 'master' into scrumboard-app

# Conflicts:
#	package.json
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index c2ccd5e0..8fc81828 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "hammerjs": "2.0.8",
     "highlight.js": "9.12.0",
     "intl": "1.2.5",
+    "md2": "0.0.28",
     "moment": "2.18.1",
     "ngx-color-picker": "4.3.1",
     "ngx-cookie-service": "1.0.7",