Skip to content
Browse files

Merge branch 'master' of github.com:collective/collective.contentlice…

…nsing
  • Loading branch information...
2 parents 0611bea + dcffeb4 commit 8758332b001bb5342c56019acae1a094ba13bd5d @erral erral committed
Showing with 9 additions and 8 deletions.
  1. +1 −1 collective/contentlicensing/version.txt
  2. +5 −4 docs/HISTORY.txt
  3. +2 −2 setup.cfg
  4. +1 −1 setup.py
View
2 collective/contentlicensing/version.txt
@@ -1 +1 @@
-2.2.0-final
+2.2.3
View
9 docs/HISTORY.txt
@@ -1,14 +1,15 @@
Changelog
=========
-2.2.3 - Unreleased
--------------------
+2.2.3
+-----
+ * Removed legacy templates that included copyright byline, which
+ results in duplicate bylines appearing [blambert]
* Added Basque (eu) translation [erral]
-
2.2.2
-------------------
+-----
* Allow content editors to select license [dimo]
* Fix copyright and other licenses [dimo]
View
4 setup.cfg
@@ -1,4 +1,4 @@
[egg_info]
-tag_build = dev
-tag_svn_revision = true
+#tag_build = dev
+#tag_svn_revision = true
View
2 setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
-version = '2.2.2'
+version = '2.2.3'
tests_require = ['plone.app.blob [test]']
setup(name='collective.contentlicensing',

0 comments on commit 8758332

Please sign in to comment.
Something went wrong with that request. Please try again.