Skip to content

Commit 1d3254b

Browse files
committed
Merge branch 'release/1.0.1'
* release/1.0.1: fixes issue #56 start v1.1
2 parents c7c2cbc + 44b2ac9 commit 1d3254b

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cache:
88
branches:
99
only:
1010
- develop
11+
- master
1112
- feature/travis
1213

1314
services:

CHANGES

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Release 1.0.1
2+
-------------
3+
* fixes :issue:`56` (thanks oppianmatt).
4+
15
Release 1.0
26
-----------
37
* **BACKWARD INCOMPATIBLE**:: dropped support for Django prior 1.6

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from setuptools.command.test import test as TestCommand
1010

1111
ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__)))
12-
sys.path.append(os.path.join(ROOT, 'src'))
12+
sys.path.insert(0, os.path.join(ROOT, 'src'))
1313

1414
app = __import__('concurrency')
1515
base_url = 'https://github.com/saxix/django-concurrency/'

src/concurrency/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
__author__ = 'sax'
66
default_app_config = 'concurrency.apps.ConcurrencyConfig'
77

8-
VERSION = __version__ = (1, 0, 0, 'final', 0)
8+
VERSION = __version__ = (1, 0, 1, 'final', 0)
99
NAME = 'django-concurrency'
1010

1111

0 commit comments

Comments
 (0)