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
..
fonts
images
libs
main.css
popup.css
style.css	Merge remote-tracking branch 'adv/modal-details'	2017-07-23 14:03:02 +02:00