[merge]

2014-11-28 12:08:51 +05:30
parent bd9b62ff28 7c82d616c9
commit 6d950d23a8
60 changed files with 5914 additions and 6100 deletions
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,10 @@
 from setuptools import setup, find_packages

+<<<<<<< HEAD
 version = "5.0.0-alpha"
+=======
+version = "4.12.0"
+>>>>>>> upstream/develop

 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()