Ozzieisaacs 2de4bfdcf2 Merge branch 'master' into Develop ... # Conflicts: # cps/book_formats.py # cps/helper.py # cps/web.py		2019-04-20 18:32:46 +02:00
..
css
images/caliblur
img
js	Merge branch 'master' into Develop	2019-04-20 18:32:46 +02:00
locale
favicon.ico
generic_cover.jpg