Merge branch 'develop'

Chris Park · Chris Park · commit 3d409ad873ef · 2016-02-25T09:40:17.000-05:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "mock-data"]
-	path = mock-data
-	url = git@github.com:rosette-api/mock-data.git
+[submodule "mock-data"]
+	path = mock-data
+	url = https://github.com/rosette-api/mock-data.git
diff --git a/mock-data b/mock-data
@@ -1 +1 @@
-Subproject commit 152f6e7a04f58fe3e63fb376cb878dc62d2a95fe
+Subproject commit 8c295c0122238cc0b0b1cf3c774ff25f1fcb5460
