Merge branch 'stable' into ont_mcedt_conformance

# Conflicts: # pom.xml # src/main/webapp/billing/CA/ON/ScheduleOfBenefitsUpload.jsp
open-osp · Feb 28, 2022 · eb1cc35 · eb1cc35
2 parents cc422b4 + 157b4e7
commit eb1cc35
Show file tree

Hide file tree

Showing 1,611 changed files with 139,530 additions and 45,887 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,6 @@ src/main/resources/uiResources_*.properties
 *.scp
 /out
 /.run*
+/catalina_base*
 *.iml
+/catalina_base/*
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ An open source electronic medical record system.
 
 ## What is OpenOscar?
 
-A community driver fork of Oscar EMR.
+A community driven fork of Oscar EMR.
 
 ## Installation
 

diff --git a/catalina_base/conf/.gitignore b/catalina_base/conf/.gitignore
diff --git a/catalina_base/conf/.keystore b/catalina_base/conf/.keystore
diff --git a/catalina_base/conf/catalina.policy b/catalina_base/conf/catalina.policy
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,6 @@ src/main/resources/uiResources_*.properties @@
     *.scp
     /out
     /.run*
+    /catalina_base*
     *.iml
+    /catalina_base/*