Merge branch 'master' into dev

This commit is contained in:
Jamie.Rees 2016-11-08 09:29:40 +00:00
commit 1793c6f592
120 changed files with 5943 additions and 5918 deletions

View file

@ -826,7 +826,7 @@ namespace PlexRequests.UI.Modules
return Response.AsJson(result
? new JsonResponseModel { Result = true, Message = "Successfully Updated the Settings for Newsletter!" }
: new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
}
}
private Response CreateApiKey()