Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/data/channels.json b/tests/data/channels.json
new file mode 100644
index 00000000..6bf65a82
--- /dev/null
+++ b/tests/data/channels.json
@@ -0,0 +1,23 @@
+{
+	"format_version": 0,
+	"channels": [
+		{
+			"id": "develop",
+			"name": "Develop",
+			"description": "The channel called \"develop\"",
+			"url": "$PWD/tests/data/"
+		},
+		{
+			"id": "stable",
+			"name": "Stable",
+			"description": "It's stable at least",
+			"url": "ftp://username@host/path/to/stuff"
+		},
+		{
+			"id": "42",
+			"name": "The Channel",
+			"description": "This is the channel that is going to answer all of your questions",
+			"url": "https://dent.me/tea"
+		}
+	]
+}