Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
seth-mg committed Dec 11, 2018
2 parents 4f71a4a + ba20614 commit 6a65de6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions rosette_api/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.12.0.0")]
[assembly: AssemblyVersion("1.12.0.0")]
[assembly: AssemblyFileVersion("1.12.0.0")]
// [assembly: AssemblyVersion("1.12.1.0")]
[assembly: AssemblyVersion("1.12.1.0")]
[assembly: AssemblyFileVersion("1.12.1.0")]
2 changes: 1 addition & 1 deletion rosette_api/rosette_api.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>rosette_api</id>
<version>1.12.0</version>
<version>1.12.1</version>
<authors>basistech</authors>
<owners>basistech</owners>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
Expand Down

0 comments on commit 6a65de6

Please sign in to comment.