arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-16 21:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge master into python-deps

Browse Source 
# Conflicts:
#	PyRIGS/settings.py
#	RIGS/admin.py
#	RIGS/models.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt
#	wercker.yml
This commit is contained in:
David Taylor
2017-05-10 17:27:52 +01:00
parent 8cfda69717 9b7c84cf08
commit 7ac9eef7a2
52 changed files with 3222 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@@ -1,3 +1,6 @@
tmp/
db.sqlite3
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
@@ -25,9 +28,6 @@ var/
# Continer extras
.vagrant
_builds
_steps
_projects
# PyInstaller
# Usually these files are written by a python script from a template