Subject: [PATCH] Built motion from commit c5bbd83.|0.0.66

From: Daniele Cinti <[email-masked]>
Date: Tue, 15 Mar 2016 19:09:58 +0100

---
 release-notes/changelog_0.0.66.txt |    1 +
 scripts/post-merge.sh              |    8 ++++++++
 2 files changed, 9 insertions(+), 0 deletions(-)
 create mode 100644 scripts/post-merge.sh

diff --git a/release-notes/changelog_0.0.66.txt b/release-notes/changelog_0.0.66.txt
index 25857c0..3b01b18 100644
--- a/release-notes/changelog_0.0.66.txt
+++ b/release-notes/changelog_0.0.66.txt
@@ -1,5 +1,6 @@
 # xCALLY MOTION Changelog
 
+- * 0035cf9 - 2016-03-15: add scripts in gruntfile 
 - * 190d31b - 2016-03-15: Changed history move service and added missing history tables. 
 - * 4253e76 - 2016-03-15: migration add migration test file 
 - * c122b65 - 2016-03-15: migration test remove 
diff --git a/scripts/post-merge.sh b/scripts/post-merge.sh
new file mode 100644
index 0000000..92f1f1d
--- /dev/null
+++ b/scripts/post-merge.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "post-merge started"
+cd /var/opt/motion
+npm install --production
+sequelize db:migrate --migrations-path server/migrations --config server/config/environment/dbconf.json
+pm2 restart motion
+echo "post-merge finished"
-- 
1.7.1