[Noalyss-commit] [noalyss] 12/27: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency

[Dany De Bontridder]

sparkyx pushed a commit to annotated tag E-8000
in repository noalyss.

commit 3f5601238964c09db4c24b8e0e4579f40c7cdaea
Merge: 6c90a40 3d96930
Author: Dany De Bontridder <dany@alchimerys.be>
AuthorDate: Sun Jan 27 21:06:06 2019 +0100

    Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into 
r700-currency

 include/anc_pa.inc.php                 | 31 ++++++++----------
 include/constant.php                   |  2 +-
 include/export/export_anc_axis_csv.php | 60 ++++++++++++++++++++++++++++++++++
 include/history_operation.inc.php      | 19 ++++++++---
 include/sql/patch/upgrade132.sql       |  2 +-
 include/sql/patch/upgrade133.sql       | 13 ++++++++
 6 files changed, 103 insertions(+), 24 deletions(-)