Merge branch 'master' into 'master'

updated submodule url updated submodule to newly created mirror See merge request !1
sailfishos · Dec 7, 2015 · f5f76c4 · f5f76c4
2 parents 3611ccf + ba11e26
commit f5f76c4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "upstream"]
 	path = upstream
-	url = git://qt.gitorious.org/qt/qtbase
+	url = https://git.merproject.org/mirror/qtbase.git