Merge branch 'master' into feature/dashboard

# Conflicts: # application/models/eloquent/Projectemployee.php
2020-01-10 17:43:05 +01:00
parent 1295814ff4 5594865554
commit 090cc90de1
35 changed files with 6932 additions and 1991 deletions
@@ -103,6 +103,10 @@ th.rotate > div > span {
    border-right: 1px solid #ccc;
    border-bottom: 1px solid #ccc;
 }
+th.sorting-field:hover{
+	cursor: pointer;
+	color:#222;
+}
 .pie-test{
    width:20px;
    height:20px;