Changeset 13603

Timestamp:

12 Jan 2016, 13:45:41 (9 years ago)

Author:

uli

Message:

Merge changes from uli-prepare-1.4 back into trunk.

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• CHANGES.txt (modified) (1 diff)
• setup.py (modified) (2 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -2 +2 @@
 *******
 
-1.3.4.dev0 (unreleased)
-=======================
+1.4.dev0 (unreleased)
+=====================
 
 * Configure transfer payments and let students enter their desired

main/waeup.kofa/trunk/setup.py

@@ -2 +2 @@
 from setuptools import setup, find_packages
 
-version = '1.3.4.dev0'
+version = '1.4.dev0'
 
 install_requires =[
@@ -18 +18 @@
     'zope.xmlpickle',
     'hurry.file',
-    #'hurry.yui',
     'hurry.zoperesource',
     'zc.sourcefactory',