Fourth merge from Julia Longtin repository with conflict fix in interface/patient_fil...
[openemr.git] / interface / 
tree0fba85065c511be571da629255b4b7fe59bd1ed5
drwxr-xr-x   ..
drwxr-xr-x - batchcom
drwxr-xr-x - billing
drwxr-xr-x - clickmap
drwxr-xr-x - code_systems
drwxr-xr-x - de_identification_forms
drwxr-xr-x - drugs
-rw-r--r-- 7284 eRx.php
-rw-r--r-- 38320 eRx_xml.php
-rw-r--r-- 325 errorWin.php
drwxr-xr-x - fax
drwxr-xr-x - forms
drwxr-xr-x - forms_admin
-rw-r--r-- 16001 globals.php
-rw-r--r-- 206 index.php
-rwxr-xr-x 2012 jump_to_RelayHealth.php
drwxr-xr-x - language
drwxr-xr-x - login
-rw-r--r-- 439 login_screen.php
-rw-r--r-- 564 logout.php
drwxr-xr-x - logview
drwxr-xr-x - main
drwxr-xr-x - new
drwxr-xr-x - orders
drwxr-xr-x - patient_file
drwxr-xr-x - pic
drwxr-xr-x - practice
drwxr-xr-x - reports
drwxr-xr-x - soap_functions
drwxr-xr-x - super
drwxr-xr-x - themes
drwxr-xr-x - usergroup
-rw-r--r-- 350 version_info.php