Merge branch 'master' into development

# Conflicts: # cps/static/css/style.css
2021-03-14 14:06:33 +01:00
parent b9c0c8d2dc 9b80c84794
commit f77d72fd86
24 changed files with 547 additions and 470 deletions
@@ -16,6 +16,7 @@
 */

 /* exported TableActions, RestrictionActions, EbookActions, responseHandler */
+/* global getPath, ConfirmDialog */

 var selections = [];