OzzieIsaacs cb5f196f4b Merge remote-tracking branch 'adv/modal-details'
# Conflicts:
#	cps/static/js/main.js
#	cps/templates/detail.html
2017-07-23 14:03:02 +02:00
..
2017-07-22 11:24:47 -07:00
2017-04-21 20:44:17 +02:00
2017-07-18 20:39:35 +02:00