Merge conflict

This commit is contained in:
2019-10-31 14:19:23 +01:00
parent 5948892b93
commit 17b50c9906
@@ -33,7 +33,7 @@ class QinvoiceMonthOverview {
GROUP BY month_id
) AS PAY
ON MNT.id = PAY.month_id
JOIN projects PRJ
LEFT JOIN projects PRJ
GROUP BY MNT.id
ORDER BY MNT.id ";