Merge branch 'master' into version-2

This commit is contained in:
Daniel J. Summers
2019-07-13 21:33:51 -05:00
5 changed files with 1647 additions and 1262 deletions

3
.gitignore vendored
View File

@@ -252,6 +252,9 @@ paket-files/
.idea/
*.sln.iml
# Ionide VSCode extension
.ionide
# Compiled files / application
src/build
src/MyPrayerJournal.Api/wwwroot/favicon.ico