From a4246c08ac6b162b735d93a73bb817debd7f174b Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sat, 2 May 2020 19:49:56 -0700
Subject: [PATCH] version 2.20.2

---
 Makefile                                         |  2 +-
 VERSION                                          |  2 +-
 .../examples/views/default/download.html         | 16 ++++++++--------
 gluon/packages/dal                               |  2 +-
 gluon/packages/yatl                              |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 645229a5..c911753f 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ rmfiles:
 	rm -rf applications/examples/uploads/* 
 src:
 	### Use semantic versioning
-	echo 'Version 2.20.1-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.20.2-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	# make rmfiles
diff --git a/VERSION b/VERSION
index 1d140ba5..351cfe53 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.20.1-stable+timestamp.2020.04.25.20.00.25
+Version 2.20.2-stable+timestamp.2020.05.02.19.46.43
diff --git a/applications/examples/views/default/download.html b/applications/examples/views/default/download.html
index dbed6375..e12efb18 100644
--- a/applications/examples/views/default/download.html
+++ b/applications/examples/views/default/download.html
@@ -9,8 +9,8 @@
   <table class="twothirds">
     <thead>
       <tr>
-        <th>For Normal Users (Py3)</th>
-        <th>For Legacy Users (Py2)</th>
+        <th>For Python 3.7</th>
+        <th>For Python 2.7</th>
         <th>For Testers</th>
         <th>For Developers</th>
       </tr>
@@ -18,13 +18,13 @@
     <tbody>
       <tr>
         <td>
-          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_win.zip">Windows binaries</a>
+          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_win_py37.zip">Windows binaries</a>
         </td>
         <td>
-          <a class="btn btn180 rounded" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_win_py2.zip">Windows binaries</a>
+          <a class="btn btn180 rounded" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_win_py27.zip">Windows binaries</a>
         </td>
         <td>
-          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_win.zip">Windows binaries</a>
+          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_win_py27.zip">Windows binaries</a>
         </td>
         <td>
           <a class="btn btn180 rounded red" href="http://github.com/web2py/web2py/">Git Repository</a>
@@ -32,13 +32,13 @@
       </tr>
       <tr>
         <td>
-          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_osx.zip">Mac binaries</a>
+          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_osx_py37.zip">Mac binaries</a>
         </td>
         <td>
-          <a class="btn btn180 rounded" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_osx_py2.zip">Mac binaries</a>
+          <a class="btn btn180 rounded" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_osx_py27.zip">Mac binaries</a>
         </td>
         <td>
-          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_osx.zip">Mac binaries</a>
+          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_osx_37.zip">Mac binaries</a>
         </td>
         <td>
           <a class="btn btn180 rounded" href="http://mdipierro.github.io/web2py/web2py_manual_5th.pdf">Manual</a>
diff --git a/gluon/packages/dal b/gluon/packages/dal
index 975a909f..407cc519 160000
--- a/gluon/packages/dal
+++ b/gluon/packages/dal
@@ -1 +1 @@
-Subproject commit 975a909f114a2710e807b5fb0ce4f2ff0c94bf90
+Subproject commit 407cc5192fa75f84db1f19abfe68d57eefc3d842
diff --git a/gluon/packages/yatl b/gluon/packages/yatl
index 10682bfc..1b0d156c 160000
--- a/gluon/packages/yatl
+++ b/gluon/packages/yatl
@@ -1 +1 @@
-Subproject commit 10682bfc7c7859754305245c8dee9748fec666e4
+Subproject commit 1b0d156cf9fe99735dfbc89299b093fc64f532c2