Merge pull request #1329 from owncloud/confpy
authorCarla Schroder <carla@owncloud.com>
Fri, 4 Dec 2015 22:40:54 +0000 (14:40 -0800)
committerCarla Schroder <carla@owncloud.com>
Fri, 4 Dec 2015 22:40:54 +0000 (14:40 -0800)
commit4349ad325ed31c11d063906a5fed53300d3eb0ca
treeb84bbd597090f2e8699090230a21650cd5d52cbe
parent1918516b5b64ad86159e9df3b2f61256a0f2cbb1
parent2d8b06359581cf9f60b97afd3adf451de9721492
Merge pull request #1329 from owncloud/confpy

update version number in conf.py