Fourth merge from Julia Longtin repository with conflict fix in interface/patient_fil...
[openemr.git] / interface / patient_file / 
treeb8714a8f895cc3dccaceb8bfcb34b5749c9fe88d
drwxr-xr-x   ..
-rw-r--r-- 15144 deleter.php
drwxr-xr-x - encounter
-rw-r--r-- 48331 front_payment.php
drwxr-xr-x - history
-rw-r--r-- 27064 letter.php
-rw-r--r-- 2155 link_issue_to_encounter.php
-rw-r--r-- 8903 merge_patients.php
-rw-r--r-- 4712 navigation.php
-rw-r--r-- 2201 patient_file.php
-rw-r--r-- 47585 pos_checkout.php
-rw-r--r-- 17810 printed_fee_sheet.php
-rw-r--r-- 12290 problem_encounter.php
drwxr-xr-x - reminder
drwxr-xr-x - report
drwxr-xr-x - rules
drwxr-xr-x - summary
drwxr-xr-x - transaction
-rw-r--r-- 3061 upload_dialog.php