Commit Graph

1 Commits

Author SHA1 Message Date
5c5ccd244d Merge branch 'master' into python_deps_2020
# Conflicts:
#	PyRIGS/settings.py
#	RIGS/templates/RIGS/event_embed.html
#	RIGS/views.py
2020-03-06 20:01:26 +00:00