Merge remote-tracking branch 'origin/hotfix' into testing
Merge remote-tracking branch 'origin/testing'
Task 1 and 2 are now working
Merge remote-tracking branch 'origin/testing'
Merge remote-tracking branch 'origin/hotfix' into testing
Merge remote-tracking branch 'origin/testing'
comments
fixed