[Noalyss-commit] [noalyss] 01/03: Merge tag 'rel6816'

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 5650459a5d8b1502765b75b99de91026feef7e1d
Merge: 404aeeb 195f8f9
Author: Dany De Bontridder <address@hidden>
Date:   Fri Aug 21 18:07:14 2015 +0200

    Merge tag 'rel6816'
    
    Conflicts:
        include/constant.php

 html/index.php                        |    2 +-
 include/class_acc_ledger.php          |    4 ++--
 include/class_acc_ledger_fin.php      |    6 +++---
 include/class_acc_ledger_info.php     |    6 +++---
 include/class_acc_ledger_purchase.php |    4 ++--
 include/class_acc_ledger_sold.php     |    4 ++--
 include/class_anc_key.php             |    2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)