From a0731012e7a4c0c09cdf69b8d2a913e62f9b2a59 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 18 Feb 2015 02:47:28 -0500
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/tools/templates/resync.htm |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
old mode 100755
new mode 100644

--
Gitblit v1.9.1