Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

diff --git a/README b/README
index d0b2d96ea3beabc037abde73ba32d877f0bc2e6d..d3415af62a9c9618d2a0c24548fdbc9cff0678ee 100644 (file)
--- a/README
+++ b/README
@@ -4,7 +4,6 @@ CasparCG Server 2.1.0 Unstable
 Thank you for your interest in CasparCG Server, a professional software used to\r
 play out and record professional graphics, audio and video to multiple outputs.\r
 CasparCG Server has been in 24/7 broadcast production since 2006.\r
-The included software is provided as-is by Sveriges Televison AB.\r
 \r
 This release is considered untested and unstable, and is NOT intended for use in\r
 professional production. Stable and production-proven versions can be downloaded\r

diff --git a/README.md b/README.md
index d5b06c58b8e5142092fd668a4eb8b5cf73470925..260feedc4357378093586b3477a34dce0281b4cf 100644 (file)
--- a/README.md
+++ b/README.md
@@ -26,5 +26,4 @@ License
 CasparCG Server is distributed under the GNU General Public License GPLv3 or
 higher, see [LICENSE](LICENSE?raw=true) for details.
 
-The included software is provided as-is by Sveriges Televison AB.
-More information is available at http://casparcg.com
+More information is available at http://casparcg.com/