Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/anion0278/mapp
Browse files Browse the repository at this point in the history
  • Loading branch information
anion0278 committed Dec 22, 2022
2 parents 5f8c4ae + 74b8e7a commit 8fcda53
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ on:
release_minor:
description: 'Release - minor number'
required: true
default: '2' # minor
default: '3' # minor
release_patch:
description: 'Release - patch number (previous 3)'
description: 'Release - patch number (previous 1)'
required: true
release_name:
description: 'Additional name of the release'
Expand Down
20 changes: 19 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,22 @@ Total of 3 new changes since v3.2.2.15:

- Update CHANGELOG.md
- Update ci_cd.yml
- Merge branch 'master' of https://github.com/anion0278/mapp
- Merge branch 'master' of https://github.com/anion0278/mapp\nNew release
Total of 1 new changes since v3.2.3.17:
## 🧰 Chores

- chore: Automated report [skip ci]

## 📦 Uncategorized

- Update changelog_settings.json

[skip ci]
- [tests] approval testing
Security - Replaced dangerous Path.Combine with Path.Join
- Merge branch 'master' into dev
- Updated projects to newer platform
- disabled UI test
- Stock quantity data conversion
Refactoring is needed!
- simple notificaiton about processing
4 changes: 2 additions & 2 deletions Mapp.UI/Properties/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("2767955e-07e8-410d-83d2-8a27cf1d63d9")]

[assembly: AssemblyVersion("3.2.3.17")]
[assembly: AssemblyFileVersion("3.2.3.17")]
[assembly: AssemblyVersion("3.3.1.19")]
[assembly: AssemblyFileVersion("3.3.1.19")]

0 comments on commit 8fcda53

Please sign in to comment.