Skip to content

Commit

Permalink
Merge branch 'master' into upstream_master
Browse files Browse the repository at this point in the history
  • Loading branch information
Ilia-Kosenkov committed Jun 22, 2021
2 parents be5b3a7 + b080a38 commit 0756b4a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/DIPOL-UF/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.5.5")]
[assembly: AssemblyVersion("2.6.0")]
//[assembly: AssemblyFileVersion("1.0.*")]
2 changes: 1 addition & 1 deletion src/Host/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0")]
[assembly: AssemblyVersion("1.3.0")]
//[assembly: AssemblyFileVersion("1.1.*")]

0 comments on commit 0756b4a

Please sign in to comment.