[Noalyss-commit] [noalyss] 27/35: Merge branch 'master' of ssh://ns2git/srv/git/noalyss

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit c47f8955ab431bfaae7fd94021f97658ec7cc32d
Merge: f535ac5 2fcebf3
Author: Dany De Bontridder <address@hidden>
Date:   Fri May 6 22:37:39 2016 +0200

    Merge branch 'master' of ssh://ns2git/srv/git/noalyss

 doc/manuel-fr.odt                       |  Bin 90962 -> 295593 bytes
 html/js/sorttable.js                    |    1 +
 html/lang/en_US/LC_MESSAGES/messages.po |  265 ++++++++++++++++++++++++++----
 html/lang/messages.po                   |  252 ++++++++++++++++++++++++----
 html/lang/nl_NL/LC_MESSAGES/messages.po |  274 +++++++++++++++++++++++++++----
 html/user_login.php                     |    2 +-
 include/ajax/ajax_admin.php             |    7 +
 include/cfgplugin.inc.php               |    3 +-
 include/class/class_acc_ledger_sold.php |    2 +-
 include/class/class_anc_operation.php   |    4 +-
 include/class/class_dossier.php         |   18 +-
 include/class/class_fiche.php           |    2 +-
 include/constant.php                    |    9 +-
 include/dossier.inc.php                 |   22 ++-
 include/lib/class_sendmail.php          |   87 +++++++++-
 include/periode.inc.php                 |   16 +-
 include/sql/patch/ac-upgrade16.sql      |   20 +++
 17 files changed, 862 insertions(+), 122 deletions(-)