Skip to content
Snippets Groups Projects
Commit ae2596fb authored by Hanna Führ's avatar Hanna Führ
Browse files

Merge remote-tracking branch 'remotes/origin/master' into Issue/2147-exchangingCoscineCertificate 

# Conflicts:
#	src/STS/Startup.cs
parents ce89812e ee5d5546
No related tags found
1 merge request!130Fix: Exchanging Coscine certificate - Step 1 second try
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
src/STS/STS.csproj
+ 1
− 1
View file @ ae2596fb
......@@ -6,7 +6,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TargetFramework>net6.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Version>3.1.0</Version>
<Version>3.1.1</Version>
</PropertyGroup>
<PropertyGroup>
<Authors>RWTH Aachen University</Authors>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment