From a5b80733d58c3e961ac882903fd52dc3c7906da5 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Mon, 1 Jun 2020 14:00:32 +0100 Subject: [PATCH] Switched static to master branch --- .gitmodules | 2 +- openflexure_microscope/api/static | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 57b6d2dd..be8a5634 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "openflexure_microscope/api/static"] path = openflexure_microscope/api/static url = https://gitlab.com/openflexure/openflexure-microscope-jsclient.git - branch = frame + branch = master diff --git a/openflexure_microscope/api/static b/openflexure_microscope/api/static index 35d0ccf6..ddcf26d4 160000 --- a/openflexure_microscope/api/static +++ b/openflexure_microscope/api/static @@ -1 +1 @@ -Subproject commit 35d0ccf68510e3dfe2b3948b4c70bfe7d72497e9 +Subproject commit ddcf26d412dad6f22b712cc6ebce3b2669d9433e