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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

9222

RIGS/static/css/screen.css

File diff suppressed because one or more lines are too long