Merge branch 'feature/yasgrafiekdivmeter' into develop

# Conflicts: # application/core/MY_Controller.php
2022-03-01 17:31:12 +01:00
parent 3a79ee0bd2 a2561eb081
commit 4aac5f8c25
42 changed files with 1967 additions and 1336 deletions
@@ -64,7 +64,8 @@ class MY_Controller extends CI_Controller{
 //    public $version = '1.17.86'; // titels en headers sop
 //    public $version = '1.17.88'; // sopfout
 //      public $version = '1.17.89'; // printformulier
-      public $version = '1.17.90'; // sops ordenen per eigen criterium
+//      public $version = '1.17.90'; // sops ordenen per eigen criterium
+    public $version = '1.17.91'; // grafieken in 3d
    
    public $partituurid;
 	public $globProfielVersieID = 1;