Skip to content

Commit

Permalink
merged branch master into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Thorsten Fröhlich committed Mar 28, 2017
1 parent 994191e commit 4330c07
Show file tree
Hide file tree
Showing 14 changed files with 574 additions and 87 deletions.
1 change: 1 addition & 0 deletions .landscape.yml
Expand Up @@ -11,6 +11,7 @@ ignore-paths:
ignore-patterns:
- ^manage.py$
- (^|/)docs(/|$)
- ^tests.py$
python-targets:
- 2
- 3
5 changes: 1 addition & 4 deletions .travis.yml
Expand Up @@ -15,6 +15,7 @@ env:
- DJANGO_VERSION='>=1.8,<1.9'
- DJANGO_VERSION='>=1.9,<1.10'
- DJANGO_VERSION='>=1.10,<1.11'
#- DJANGO_VERSION='>=1.11,<1.12' Django 1.11 coming soon

# Command to install dependencies, e.g. pip install -r requirements.txt
install:
Expand All @@ -30,10 +31,6 @@ script:

matrix:
exclude:
- python: "3.2"
env: DJANGO_VERSION='>=1.9,<1.10'
- python: "3.2"
env: DJANGO_VERSION='>=1.10,<1.11'
- python: "3.3"
env: DJANGO_VERSION='>=1.9,<1.10'
- python: "3.3"
Expand Down
2 changes: 1 addition & 1 deletion PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django-propeller
Version: 1.4.0
Version: 1.4.1
Summary: Propeller support for Django projects
Home-page: https://github.com/tfroehlich82/django-propeller
Author: Thorsten Froehlich
Expand Down
2 changes: 1 addition & 1 deletion django_propeller/__init__.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

__version__ = '1.4.0'
__version__ = '1.4.1'

0 comments on commit 4330c07

Please sign in to comment.