From: Mike Taylor <mike@indexdata.com>
Date: Tue, 23 Sep 2014 09:39:53 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~324^2~17^2
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=c0abb7354795a250ce50db8d60ed1b0e024edce3;hp=39b9383884205cf4d2a1a55927702780f90b2f9f

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..f2fc3f4
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1 @@
+mkws-templates.js
diff --git a/tools/htdocs/.gitignore b/tools/htdocs/.gitignore
index b31bd88..69d2713 100644
--- a/tools/htdocs/.gitignore
+++ b/tools/htdocs/.gitignore
@@ -1,7 +1,7 @@
 NEWS
 README.html
 VERSION
-handlebars-v1.1.2.js
+handlebars-v1.3.0.js
 jquery-1.10.0.min.js
 jquery.json-2.4.js
 mkws-complete.js