Tom Price 573b8f9fb5 Merge branch 'master' into markdown ...

# Conflicts:
#	RIGS/static/css/screen.css
#	db.sqlite3
#	requirements.txt

2016-03-30 23:36:00 +01:00

..

ajax-bootstrap-select.css

…

bootstrap-datetimepicker.min.css

…

bootstrap-select.min.css

…

fullcalendar.css

…

fullcalendar.print.css

…

ie.css

…

print.css

Merge branch 'master' into markdown

2016-03-30 23:36:00 +01:00

screen.css

Merge branch 'master' into markdown

2016-03-30 23:36:00 +01:00