Merge branch 'release/1.5' into develop

* release/1.5: bump 1.5
saxix · Jun 12, 2017 · ef32750 · ef32750
2 parents 6b41056 + 03f1aa7
commit ef32750
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,5 @@
-Release 1.5 (dev)
-=================
+Release 1.5
+===========
 * add official support to Django 1.11 and Python 3.6
 * fixes :ghissue:`116` Fixing ManyToMany merging with intermediary models. (thanks int-ua)
 * fixes :ghissue:`95` Cannot merge models with subclassed ImageField or FileField: "file not sent". (thanks int-ua)

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -81,7 +81,7 @@
 
 # General information about the project.
 project = u'Django Admin Actions'
-copyright = u'2012, Stefano Apostolico'
+copyright = u'2012-2016, Stefano Apostolico'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/src/adminactions/__init__.py b/src/adminactions/__init__.py
@@ -2,7 +2,7 @@
 import os
 import subprocess
 
-VERSION = __version__ = (1, 5, 0, 'alpha', 0)
+VERSION = __version__ = (1, 5, 0, 'final', 0)
 NAME = 'django-adminactions'