Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update submodules for v1.2 #211

Merged
merged 2 commits into from
May 18, 2021
Merged

Update submodules for v1.2 #211

merged 2 commits into from
May 18, 2021

Conversation

matthew-white
Copy link
Member

@matthew-white matthew-white commented Apr 14, 2021

I'll use this branch to update the submodules for v1.2. I'm also committing a path change that follows from getodk/central-backend#331. @issa-tseng, I think this is the only change needed to central after the Backend refactor — is that right?

@matthew-white
Copy link
Member Author

CircleCI is failing, but it should pass once I update the submodules before release.

@matthew-white
Copy link
Member Author

This is what I see when I diff locally for the last commit:

diff --git a/client b/client
index cddb691..4f366fd 160000
--- a/client
+++ b/client
@@ -1 +1 @@
-Subproject commit cddb691e40e84aabff87b9d427e22a50282d6f99
+Subproject commit 4f366fd674d83b7f2f156822e5a8d2ceca563b32
diff --git a/server b/server
index a33bc6f..24d20de 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit a33bc6fb3c34fe38894b0e9d0bb404f81da325e6
+Subproject commit 24d20de20fdf2e03b55e687542fbc0cae889a9ff

@matthew-white matthew-white merged commit 7a12f04 into master May 18, 2021
@matthew-white matthew-white deleted the update-submodules branch May 18, 2021 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants