diff --git a/CHANGELOG b/CHANGELOG index 25090cf7..d515f7bd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +## 2.9.6 + +- fixed a typo in the license of some login_methods code. It is now LGPL consistently with the rest of the web2py code. This change applied to all previous web2py versions. + ## 2.9.1 - 2.9.5 - many small but important bug fixes diff --git a/VERSION b/VERSION index d41a2966..161c4e56 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.5-trunk+timestamp.2014.03.28.21.24.22 +Version 2.9.5-trunk+timestamp.2014.03.29.00.57.10