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

Merge branch 'master' into markdown

Browse Source 
# Conflicts:
#	RIGS/static/css/screen.css
#	db.sqlite3
#	requirements.txt
This commit is contained in:
Tom Price
2016-03-30 23:34:33 +01:00
parent c6128d9a34 f13303490a
commit 573b8f9fb5
24 changed files with 734 additions and 9729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
requirements.txt
View File

@@ -1,4 +1,5 @@
beautifulsoup4==4.4.1
diff-match-patch==20121119
dj-database-url==0.3.0
dj-static==0.0.6
Django==1.8.2
@@ -21,7 +22,7 @@ python-dateutil==2.4.2
pytz==2015.4
raven==5.8.1
reportlab==3.1.44
selenium==2.46.0
selenium==2.53.1
simplejson==3.7.2
six==1.9.0
sqlparse==0.1.15