Merge remote-tracking branch 'origin/master'

gregdick1 · Jul 17, 2019 · e0fdf62 · e0fdf62
2 parents edcce62 + 825bb50
commit e0fdf62
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 1,724 deletions.
diff --git a/.gitignore b/.gitignore
@@ -124,6 +124,7 @@ log.txt
 /build
 
 # misc
+.idea/
 .DS_Store
 .env.local
 .env.development.local

diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/dataSources.ids b/.idea/dataSources.ids
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
diff --git a/.idea/dataSources/10bc2654-8170-4e72-913f-e6a281eaf81a.xml b/.idea/dataSources/10bc2654-8170-4e72-913f-e6a281eaf81a.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,6 +124,7 @@ log.txt @@
     /build
     # misc
+    .idea/
     .DS_Store
     .env.local
     .env.development.local
@@ Expand Down @@