Merge pull request #310 from EducationalTestingService/release/1.2

Release v1.2
EducationalTestingService · Feb 24, 2016 · da21df0 · da21df0
2 parents 4e37669 + c1571d4
commit da21df0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 91 deletions.
diff --git a/conda-recipe/unix/skll/meta.yaml b/conda-recipe/unix/skll/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: skll
-  version: 1.1.1
+  version: 1.2
 
 source:
   path: ../../../../skll

diff --git a/conda-recipe/windows/skll/meta.yaml b/conda-recipe/windows/skll/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: skll
-  version: 1.1.1
+  version: 1.2
 
 source:
   path: ../../../../skll

diff --git a/conda.yaml b/conda.yaml
diff --git a/skll/version.py b/skll/version.py
@@ -7,5 +7,5 @@
 :organization: ETS
 """
 
-__version__ = '1.1.1'
+__version__ = '1.2'
 VERSION = tuple(int(x) for x in __version__.split('.'))