Conflicts: html/ajax_misc.php include/ajax/ajax_card.php include/ajax/ajax_follow_up.php include/class/acc_ledger.class.php sql/upgrade.sql
sparkyx