Merge pull request #1683 from bendiy/4_6_x
authorLinda Nichols <lynnaloo@gmail.com>
Fri, 18 Jul 2014 21:31:17 +0000 (17:31 -0400)
committerLinda Nichols <lynnaloo@gmail.com>
Fri, 18 Jul 2014 21:31:17 +0000 (17:31 -0400)
commit7b2d56663de24eae5e51b3beec685aac0fa226b3
tree4c4a69689b81a2d7125ade312f8fb6119c04a4a3
parent78119039d37008e8870056cee190e2c616dcd5f2
parent9eba9fbab4b2cc5bad7f382cf3615068e68cd36e
Merge pull request #1683 from bendiy/4_6_x

Allow both JWT grant types.