Merge branch 'tomgross-plone5' of git://github.com/collective/collect…

…ive.taxonomy into tomgross-plone5 Conflicts: .coveragerc .travis.yml
collective · Jul 14, 2016 · f64661d · f64661d
2 parents 67ad406 + d10a7be
commit f64661d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ parts
 var
 node_modules/
 npm-debug.log
+.idea
 include/
 lib/
 share/

diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
 language: python
 sudo: false
 python: 2.7
-cache:
-  pip: true
 env:
   - PLONE_VERSION=4.3
   - PLONE_VERSION=5.0
+cache:
+  pip: true
 install:
   - sed -ie "s#travis-4.x.cfg#travis-$PLONE_VERSION.x.cfg#" travis.cfg
   - mkdir -p buildout-cache/downloads

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -37,6 +37,9 @@ Changes
   in your profile
   [petschki]
 
+- Plone 5 compatibility
+  [tomgross]
+
 1.2.3 (2014-02-07)
 ------------------