Merge branch 'feature/draganddrop' into develop
# Conflicts: # application/core/MY_Controller.php # public/js/monpas/models/ontwikkelmodel.js
This commit is contained in:
@@ -94,4 +94,8 @@ class Pdfmaker extends MY_Controller{
|
||||
//
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user