Skip to content

Commit

Permalink
Merge branch 'release/1.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Cory Todd committed Feb 26, 2020
2 parents 786d1d3 + 853fc95 commit 66d8fee
Show file tree
Hide file tree
Showing 35 changed files with 1,228 additions and 1,118 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,9 @@ PyramidNETRS232_TestApp_Simple/obj/
*.nupkg
PauseResumeCLI/obj/
PauseResumeCLI/bin/
/.idea/
/TestApp.Installer/bin/
/TestApp.Installer/obj/
*.msi
/TestApp.Installer/build/
*.wixpdb
Loading

0 comments on commit 66d8fee

Please sign in to comment.