Merge 3.24 branch
authorDenis Laxalde <denis.laxalde@logilab.fr>
Fri, 18 Nov 2016 15:42:10 +0100
changeset 11841 48adf4dd1ce6
parent 11840 1eb3d6cd39c3 (diff)
parent 11839 18e72d24dc58 (current diff)
child 11850 87443f279b0f
Merge 3.24 branch
cubicweb/__pkginfo__.py
debian/cubicweb-common.install
debian/cubicweb-ctl.bash_completion
debian/cubicweb-ctl.cubicweb.init
debian/cubicweb-ctl.install
debian/cubicweb-ctl.logrotate
debian/cubicweb-ctl.postinst
debian/cubicweb-dev.install
debian/cubicweb-dev.lintian-overrides
debian/cubicweb-documentation.doc-base
debian/cubicweb-documentation.install
debian/cubicweb-server.install
debian/cubicweb-server.postinst
debian/cubicweb-server.prerm
debian/cubicweb-twisted.install
debian/cubicweb-twisted.postinst
debian/cubicweb-twisted.prerm
debian/cubicweb-web.install
debian/cubicweb-web.lintian-overrides
debian/pydist-overrides
--- a/cubicweb/__pkginfo__.py	Fri Nov 18 15:00:43 2016 +0100
+++ b/cubicweb/__pkginfo__.py	Fri Nov 18 15:42:10 2016 +0100
@@ -27,8 +27,8 @@
 
 modname = distname = "cubicweb"
 
-numversion = (3, 24, 1)
-version = '.'.join(str(num) for num in numversion)
+numversion = (3, 25, 0)
+version = '.'.join(str(num) for num in numversion) + '.dev0'
 
 description = "a repository of entities / relations for knowledge management"
 author = "Logilab"