Merge selected master changes into v5

zikula-modules / DizkusModule

Official repository for Dizkus, a fully integrated forum solution for Zikula 1.4+

21 stars 7 forks source link

Merge selected master changes into v5 #334

Closed Kaik closed 6 years ago

Kaik commented 6 years ago

Merge selected master changes into v5

Kaik commented 6 years ago

Ok so after this all work is in 1.5 then I will need to push to master again to have everything in sync I could in principle use rebase but then I would need to force push and I do not want to do that. There is a lot of code waiting to be added but first I want to solve workflow so I can work on both versions the way work on core is done. I hope it will be ok...