Ozzieisaacs 2a5f2ff7b3 Merge branch 'master' into Develop ... # Conflicts: # cps/templates/readpdf.html # cps/translations/uk/LC_MESSAGES/messages.po # cps/web.py		2019-04-13 16:42:09 +02:00
..
fonts
images	Merge branch 'master' into Develop	2019-04-13 16:42:09 +02:00
libs	Merge branch 'master' into Develop	2019-04-13 16:42:09 +02:00
caliBlur.min.css	fixed description read-more button	2019-02-20 12:57:38 -05:00
kthoom.css
listen.css
main.css
popup.css
style.css	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
upload.css	fixing issue #833	2019-03-08 20:44:45 -05:00