I'm a bit lost, when trying to merge 1.1 to trunk, I get a conflict on domain/task/task.py which I can't quite figure out. Could you take a look ?
Cheers Jérôme
I'm a bit lost, when trying to merge 1.1 to trunk, I get a conflict on domain/task/task.py which I can't quite figure out. Could you take a look ?
Cheers Jérôme