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)
update version number in conf.py


Trivial merge