From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 server/conf/index/robots.txt |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/server/conf/index/robots.txt b/server/conf/index/robots.txt
index eb05362..7d329b1 100644
--- a/server/conf/index/robots.txt
+++ b/server/conf/index/robots.txt
@@ -1,2 +1 @@
 User-agent: *
-Disallow:

--
Gitblit v1.9.1