Merge branch 'master' into production
Merge branch 'master' into production
fix problem CGI cannot give err info
lock create new period decision for the timebeing
unlock
lock generate decisions for first period
lock init decisions for the timbering
lock create new decision for the time being
un-lock generate decisions
Merge branch 'production'