Merge branch '10287-sso-username' refs #10287
authorTom Clegg <tom@curoverse.com>
Thu, 20 Oct 2016 10:01:43 +0000 (06:01 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 20 Oct 2016 10:01:43 +0000 (06:01 -0400)
commit7e54f217895d2f401563c54704c73a196e2d236d
tree36a6f6061e1cfd5402ea4b5ea4df0683a50d51ee
parent81d1a618e724c6e9f20f4efa47acbcef4bba5f15
parent8ffceeb0bddd457cee62586d405afd8e082e1d6f
Merge branch '10287-sso-username' refs #10287