David Taylor 7ac9eef7a2 Merge master into python-deps ...

# Conflicts:
#	PyRIGS/settings.py
#	RIGS/admin.py
#	RIGS/models.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt
#	wercker.yml

2017-05-10 17:32:21 +01:00

..

formats

Set default date formats

2015-05-23 16:57:45 +01:00

__init__.py

Initial commit

2014-10-23 21:48:04 +01:00

decorators.py

Made pretty, and made embedding accessible to non-keyholders

2016-10-08 21:38:12 +01:00

settings.py

Merge master into python-deps

2017-05-10 17:32:21 +01:00

urls.py

Update settings and urls to fix new deprecations

2016-03-31 12:33:46 +01:00

wsgi.py

Fix typo

2015-04-24 17:06:22 +01:00