Merge branch 'develop' into generic_modal_v2

This commit is contained in:
vabene1111
2021-11-30 17:23:27 +01:00
committed by GitHub
42 changed files with 1122 additions and 748 deletions

View File

@@ -213,5 +213,6 @@
"Clear": "Clear",
"err_move_self": "Cannot move item to itself",
"nothing": "Nothing to do",
"err_merge_self": "Cannot merge item with itself"
"err_merge_self": "Cannot merge item with itself",
"show_sql": "Show SQL"
}