Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Sitefinity/feather
Browse files Browse the repository at this point in the history
  • Loading branch information
ElenaGaneva committed Jan 16, 2015
2 parents 929f366 + 9b00817 commit 07cf7d0
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Telerik.Sitefinity.Frontend/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
// 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.1.30.1")]
[assembly: AssemblyFileVersion("1.1.30.1")]
[assembly: AssemblyVersion("1.1.40.0")]
[assembly: AssemblyFileVersion("1.1.40.0")]

[assembly: ControllerContainer]

Expand Down
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.1.30.1")]
[assembly: AssemblyFileVersion("1.1.30.1")]
[assembly: AssemblyVersion("1.1.40.0")]
[assembly: AssemblyFileVersion("1.1.40.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,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.0.*")]
[assembly: AssemblyVersion("1.1.30.1")]
[assembly: AssemblyFileVersion("1.1.30.1")]
[assembly: AssemblyVersion("1.1.40.0")]
[assembly: AssemblyFileVersion("1.1.40.0")]
[assembly: IntegrationTests]
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// 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.1.30.1")]
[assembly: AssemblyFileVersion("1.1.30.1")]
[assembly: AssemblyVersion("1.1.40.0")]
[assembly: AssemblyFileVersion("1.1.40.0")]
[assembly: UIArrangement]
[assembly: ControllerContainer]
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,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.1.30.1")]
[assembly: AssemblyFileVersion("1.1.30.1")]
[assembly: AssemblyVersion("1.1.40.0")]
[assembly: AssemblyFileVersion("1.1.40.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,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.1.30.1")]
[assembly: AssemblyFileVersion("1.1.30.1")]
[assembly: AssemblyVersion("1.1.40.0")]
[assembly: AssemblyFileVersion("1.1.40.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,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.1.30.1")]
[assembly: AssemblyFileVersion("1.1.30.1")]
[assembly: AssemblyVersion("1.1.40.0")]
[assembly: AssemblyFileVersion("1.1.40.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
// 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.1.30.1")]
[assembly: AssemblyFileVersion("1.1.30.1")]
[assembly: AssemblyVersion("1.1.40.0")]
[assembly: AssemblyFileVersion("1.1.40.0")]

[assembly: InternalsVisibleTo("Telerik.Sitefinity.Frontend.TestUnit")]
[assembly: ControllerContainer]

0 comments on commit 07cf7d0

Please sign in to comment.