Merge with 3.25 branch
authorDenis Laxalde <denis.laxalde@logilab.fr>
Fri, 14 Apr 2017 15:40:15 +0200
changeset 12163 1fa3a3402c1e
parent 12073 339b26bf17d2 (diff)
parent 12162 c1d7c0f66210 (current diff)
child 12164 8d1a7021c817
Merge with 3.25 branch
README.pyramid.rst
cubicweb/hooks/logstats.py
doc/api/pyramid/tools.rst