Commit be14d83f authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/b24'

# Conflicts:
#	data/formules/FORMULE_ROCHELLE.ods
parents ee4c7a49 7d218a8d
Loading
Loading
Loading
Loading