Skip to content

Commit

Permalink
Merge branch 'main' into merge-main-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil91 committed Aug 25, 2023
2 parents eb7eb64 + 372290b commit 12bafe9
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 204 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ on:
tags:
- 'v*.*.*'
- '!v*.*.*-RC*'
- '!v*.*.*-iam'
workflow_dispatch:

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_iam-seeding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ name: Release IAM Seeding
on:
push:
tags:
- 'iam-v*.*.*'
- 'v*.*.*-iam'
workflow_dispatch:

env:
Expand Down
266 changes: 91 additions & 175 deletions CHANGELOG.md

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ This project uses and has modified the following code:
* Licence Path: https://github.com/lvermeulen/Keycloak.Net/blob/main/LICENSE
* Source URL: https://github.com/lvermeulen/Keycloak.Net

This project uses the following image content:

* Image: Catena-X Logo
* Source URL: https://catena-x.net

## Cryptography

Content may contain encryption software. The country in which you are currently
Expand Down
22 changes: 0 additions & 22 deletions docker/notice-provisioning-service.md

This file was deleted.

2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<Project>
<PropertyGroup>
<VersionPrefix>1.6.0</VersionPrefix>
<VersionSuffix>RC8</VersionSuffix>
<VersionSuffix></VersionSuffix>
</PropertyGroup>
</Project>
5 changes: 0 additions & 5 deletions src/mailing/Mailing.Template/Images/Catena-X long.license

This file was deleted.

0 comments on commit 12bafe9

Please sign in to comment.