Merge pull request #1 from dstegelman/master

merge main
blodone · Sep 7, 2017 · 80b111a · 80b111a
2 parents 514fdb5 + f5034d4
commit 80b111a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ env:
   - DJANGO_VERSION=Django==1.8
   - DJANGO_VERSION=Django==1.9
   - DJANGO_VERSION=Django==1.10
+  - DJANGO_VERSION=Django==1.11
 
 # command to install dependencies
 install:

diff --git a/AUTHORS b/AUTHORS
@@ -10,3 +10,5 @@ o-zander
 pinda
 nielsonsantana
 Goury (ninamori.org)
+blodone
+ulistaerk
diff --git a/CHANGELOG b/CHANGELOG
@@ -50,7 +50,7 @@ command is called in batches.
 
 - Added feature of set reply-to on the message
 
-2.3.0
+3.0.0
 -----
 
 - Django 1.9 Support
@@ -59,3 +59,11 @@ command is called in batches.
 - Removed South migrations
 - Cleanup/pep8 fixes
 - Celery 3.x syntax.  Mail queue now requires celery > 3 if using async email sending.
+- Python 3 Support
+
+
+3.1.0
+-----
+
+- Add CC addresses
+- Bug fixes
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.0.2'
+version = '3.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.2'
+release = '3.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/mailqueue/__init__.py b/mailqueue/__init__.py
@@ -1,3 +1,3 @@
-VERSION = '3.0.2'
+VERSION = '3.1.0'
 
 default_app_config = 'mailqueue.apps.MailQueueConfig'