Merge branch 'master' into 1.0

65f69645 · Alain Takoudjou · a833b75d · 5d243d1a · 65f69645
Commit 65f69645 authored Oct 26, 2015 by Alain Takoudjou
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

setup.py setup.py +1 -1

No files found.
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os

-version = '1.0.14'
+version = '1.0.15.dev0'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"