From 90127597690f98e95bb3bfb59a6cd0315f64e14b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 22 Jul 2016 01:59:21 -0400 Subject: 3.0.5990 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index a452789cf..c122e6db7 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5986")] +[assembly: AssemblyVersion("3.0.5990")] -- cgit v1.2.3 From 821d6731113d63dd340b8b7f45e6c1698e005393 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 22 Jul 2016 16:47:35 -0400 Subject: fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index c122e6db7..660e04d02 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5990")] +[assembly: AssemblyVersion("3.1.73")] -- cgit v1.2.3 From f71e88f748fe3aba928d8a845286f3b89278075c Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 22 Jul 2016 16:48:46 -0400 Subject: 3.0.5991 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 660e04d02..108a16bf4 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.73")] +[assembly: AssemblyVersion("3.0.5991")] -- cgit v1.2.3 From d661f690f58cd05be86843d2c7c8a2984c66c2f6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 23 Jul 2016 16:12:52 -0400 Subject: fix merge conflicts --- MediaBrowser.Api/Dlna/DlnaService.cs | 4 +--- SharedVersion.cs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'SharedVersion.cs') diff --git a/MediaBrowser.Api/Dlna/DlnaService.cs b/MediaBrowser.Api/Dlna/DlnaService.cs index 92ef8722e..dd4b59b92 100644 --- a/MediaBrowser.Api/Dlna/DlnaService.cs +++ b/MediaBrowser.Api/Dlna/DlnaService.cs @@ -34,8 +34,6 @@ namespace MediaBrowser.Api.Dlna [Route("/Dlna/Profiles/{Id}", "POST", Summary = "Updates a profile")] public class UpdateProfile : DeviceProfile, IReturnVoid { - [ApiMember(Name = "Id", Description = "Profile Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] - public string Id { get; set; } } [Route("/Dlna/Profiles", "POST", Summary = "Creates a profile")] @@ -89,4 +87,4 @@ namespace MediaBrowser.Api.Dlna _dlnaManager.CreateProfile(request); } } -} +} \ No newline at end of file diff --git a/SharedVersion.cs b/SharedVersion.cs index 108a16bf4..17087a098 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5991")] +[assembly: AssemblyVersion("3.1.75")] -- cgit v1.2.3 From 677709f420b5f62046ba1aecb47418735596c07e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 23 Jul 2016 16:13:49 -0400 Subject: 3.0.6000 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 17087a098..651eaf438 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.75")] +[assembly: AssemblyVersion("3.0.6000")] -- cgit v1.2.3 From b3db8fdb0d718a7e4378bb901fbfb7329b8124af Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 27 Jul 2016 15:31:19 -0400 Subject: fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 651eaf438..3b18c027e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6000")] +[assembly: AssemblyVersion("3.1.80")] -- cgit v1.2.3