Merge branch 'feature/draganddrop' into develop

# Conflicts:
#	application/core/MY_Controller.php
#	public/js/monpas/models/ontwikkelmodel.js
This commit is contained in:
Monique
2022-10-09 12:01:17 +02:00
6 changed files with 36 additions and 42 deletions
@@ -94,4 +94,8 @@ class Pdfmaker extends MY_Controller{
//
}
}