Ozzie Isaacs 3946ef8f0d Merge branch 'master' into Develop ...

# Conflicts:
#	cps.py
#	cps/web.py

2021-08-27 16:16:24 +02:00

..

locale

…

bootstrap-editable.min.js

…

bootstrap-table-editable.min.js

Add all html special characters to the escaped characters in bootstrap table

2021-08-27 12:56:08 +02:00

bootstrap-table.min.js

…