Matthew Jones c231601b76 Fix merge issues on stdout branch ...

The act of committing a PR that including part of these changes and then
reverting it meant that some of the changes from the original branch
didn't land in this new PR.   This commit adds the missing bits.

Lesson learned:  Create a new branch when submitting a PR on a
previously reverted PR

2015-08-04 09:57:39 -04:00

..

management

Adjust usage of is_ha_environment()

2015-07-08 14:18:04 -04:00

templates

Fix merge issues on stdout branch

2015-08-04 09:57:39 -04:00

tests

fixed copyright date

2015-06-11 16:10:23 -04:00

utils

fixed copyright date

2015-06-11 16:10:23 -04:00

__init__.py

fixed copyright date

2015-06-11 16:10:23 -04:00

authentication.py

fixed copyright date

2015-06-11 16:10:23 -04:00

filters.py

fixed copyright date

2015-06-11 16:10:23 -04:00

generics.py

Fix merge issues on stdout branch

2015-08-04 09:57:39 -04:00

license.py

fixed copyright date

2015-06-11 16:10:23 -04:00

models.py

fixed copyright date

2015-06-11 16:10:23 -04:00

pagination.py

fixed copyright date

2015-06-11 16:10:23 -04:00

permissions.py

fixed copyright date

2015-06-11 16:10:23 -04:00

renderers.py

Fix merge issues on stdout branch

2015-08-04 09:57:39 -04:00

serializers.py

Fix merge issues on stdout branch

2015-08-04 09:57:39 -04:00

urls.py

fixed copyright date

2015-06-11 16:10:23 -04:00

views.py

Fix merge issues on stdout branch

2015-08-04 09:57:39 -04:00