Christophe Simonis e35b57d6f5 [MERGE] forward port of branch 8.0 up to 26b3501 ...

# Conflicts:
#	addons/procurement/procurement.py

2016-06-10 12:23:34 +02:00

..

csv

…

lib/javascript-state-machine

…

src

[MERGE] forward port of branch 8.0 up to 26b3501

2016-06-10 12:23:34 +02:00