Merge dev into branch

This commit is contained in:
Jim MacKenzie 2016-10-17 19:55:53 -05:00
commit 83050edf68
19 changed files with 487 additions and 87 deletions

View file

@ -40,5 +40,6 @@ namespace PlexRequests.Core.SettingModels
public string PlexAuthToken { get; set; }
public string MachineIdentifier { get; set; }
public string PlexDatabaseLocationOverride { get; set; }
}
}