Merge branch 'master' into filippo_load_moderation_js

2018-12-13 09:36:47 +01:00 · 2018-12-13 09:36:47 +01:00 · 08dd858b91
commit 08dd858b91
parent 3356240104 97d9c58760
2 changed files with 14 additions and 2 deletions
--- a/CHANGES.rst
+++ b/CHANGES.rst
@ -1,7 +1,7 @@
 Changelog
 =========

-3.0.7 (unreleased)
+3.1.1 (unreleased)
 ------------------

 Breaking changes:
@ -10,6 +10,18 @@ Breaking changes:

 New features:

+- *add item here*
+
+Bug fixes:
+
+- *add item here*
+
+
+3.1.0 (2018-10-30)
+------------------
+
+New features:
+
 - Added notification about the publishing or elimination of a comment.
  [eikichi18]

--- a/setup.py
+++ b/setup.py
@ -4,7 +4,7 @@ from setuptools import find_packages
 from setuptools import setup


-version = '3.0.7.dev0'
+version = '3.1.1.dev0'

 install_requires = [
    'setuptools',