From 6612fd1cfeee73e0adce49479aa0068501cdce18 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 26 Apr 2015 08:50:16 -0500 Subject: [PATCH] told git to track the right submodule branch --- .gitmodules | 2 ++ gluon/packages/dal | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 71525aff8..2608f5370 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,5 @@ [submodule "gluon/packages/dal"] path = gluon/packages/dal url = https://github.com/web2py/pydal.git +[submodule "gluon.packages.dal"] + branch = 15.03-maintenance diff --git a/gluon/packages/dal b/gluon/packages/dal index 9272062bf..62eb7767d 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit 9272062bf1f8ed91e47991712a795fe9d80cb92c +Subproject commit 62eb7767db6ba88399034a785c7d35bf1f546437