From 59700b8d06507a0b808efb3e4a5962f6af3992c7 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 7 Apr 2019 21:16:13 -0700 Subject: [PATCH] R-2.18.5 --- CHANGELOG | 2 +- Makefile | 2 +- VERSION | 2 +- gluon/packages/dal | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e27d5bdc..c0735936 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -## 2.18.1-2.18.4 +## 2.18.1-2.18.5 - pydal 19.02 - made template its own module (Yet Another Template Language) - improved python 3.4-3.7 support diff --git a/Makefile b/Makefile index fba4fbd3..2e33adf9 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ rmfiles: rm -rf applications/examples/uploads/* src: ### Use semantic versioning - echo 'Version 2.18.4-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION + echo 'Version 2.18.5-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 ceadb05f..67432273 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.18.4-stable+timestamp.2019.03.12.22.20.22 +Version 2.18.5-stable+timestamp.2019.04.07.21.13.59 diff --git a/gluon/packages/dal b/gluon/packages/dal index 39c8463f..55a98df7 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit 39c8463f959c42173f7bc5575652595bc6b22c02 +Subproject commit 55a98df73ef3460e8b57e9494fe555da7474b869