Commit Graph

1 Commits

Author SHA1 Message Date
David Euresti
6e75432504 Merge token module into 2and3 (#1146)
* Merge token module; add values from 3.5

* Move token to 2and3

* Switch to ellipsis for token
2017-04-06 18:46:14 -07:00