Merge branch 'patch-1' of https://github.com/ekevoo/Newtonsoft.Json into ekevoo-patch-1

This commit is contained in:
James Newton-King
2017-10-27 13:18:46 +13:00
@@ -47,12 +47,14 @@ namespace Newtonsoft.Json.Converters
{
/// <summary>
/// Gets or sets a value indicating whether the written enum text should be camel case.
/// Defaults to <c>false</c>.
/// </summary>
/// <value><c>true</c> if the written enum text will be camel case; otherwise, <c>false</c>.</value>
public bool CamelCaseText { get; set; }
/// <summary>
/// Gets or sets a value indicating whether integer values are allowed when deserializing.
/// Defaults to <c>true</c>.
/// </summary>
/// <value><c>true</c> if integers are allowed when deserializing; otherwise, <c>false</c>.</value>
public bool AllowIntegerValues { get; set; }
@@ -180,4 +182,4 @@ namespace Newtonsoft.Json.Converters
return t.IsEnum();
}
}
}
}