Merged stra_review_stable into stable

open-osp · Feb 23, 2022 · 157b4e7 · 157b4e7
2 parents e3c6a89 + 4577c59
commit 157b4e7
Show file tree

Hide file tree

Showing 1,190 changed files with 48,191 additions and 42,723 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,9 @@ oscar.iml
 src/test/resources/over_ride_config.properties
 src/main/resources/uiResources_*.properties
 *.DS_Store
-*.swp
+*.scp
 /out
 /.run*
+/catalina_base*
 *.iml
+/catalina_base/*
diff --git a/.settings/org.eclipse.jdt.launching.prefs b/.settings/org.eclipse.jdt.launching.prefs
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
diff --git a/catalina_base/conf/catalina.properties b/catalina_base/conf/catalina.properties