diff --git a/CHANGELOG b/CHANGELOG index 51a2177c..9997466d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,8 @@ - support for Collection+JSON Hypermedia API (RESTful self documenting API) - jQuery 1.11 - codemirror 4.0.3 +- markdown2 2.2.3 +- memcache 1.53 - support for the new janrain API - new "web2py.py -G config" to make GAE configuration easier - many small bug fixes diff --git a/Makefile b/Makefile index 9c6235b6..831a5ff4 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ update: echo "remember that pymysql was tweaked" src: ### Use semantic versioning - echo 'Version 2.9.9-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION + echo 'Version 2.9.10-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION ### rm -f all junk files make clean ### clean up baisc apps diff --git a/VERSION b/VERSION index bf409e3f..443d77dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.15.07.34.08 +Version 2.9.10-stable+timestamp.2014.09.15.08.05.10