Ozzieisaacs 4fd4cf4355 Merge branch 'master' into Develop ... # Conflicts: # cps/static/css/style.css # cps/web.py		2021-11-13 17:41:16 +04:00
..
cmaps
css
img
js	Merge branch 'master' into Develop	2021-11-13 17:41:16 +04:00
locale
favicon.ico
generic_cover.jpg