Merge branch 'master' into ci

This commit is contained in:
oesi
2017-01-27 08:34:09 +01:00
4 changed files with 407 additions and 96 deletions
+4
View File
@@ -2428,6 +2428,10 @@ class wochenplan extends basis_db
$end_time=$row->ende;
break;
}
else
{
break;
}
}
}
}