From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 README.md |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..4676d2b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+# ISPConfig - Hosting Control Panel
+
+- Manage multiple servers from one control panel
+- Web server management (Apache2 and nginx)
+- Mail server management (with virtual mail users)
+- DNS server management (BIND and MyDNS)
+- Virtualization (OpenVZ)
+- Administrator, reseller and client login
+- Configuration mirroring and clusters
+- Open Source software (BSD license)
\ No newline at end of file

--
Gitblit v1.9.1