Ozzie Isaacs 3946ef8f0d Merge branch 'master' into Develop ... # Conflicts: # cps.py # cps/web.py		2021-08-27 16:16:24 +02:00
..
locale	Fix #1915 (more than 10 books at a time are displayed in books table)	2021-06-05 18:41:52 +02:00
bootstrap-editable.min.js	Fix #590, #589.	2018-08-27 22:08:55 +02:00
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	Update bootstrap-table	2021-04-02 17:11:16 +02:00