diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-23 16:17:18 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-23 16:17:18 -0700 |
commit | 294bc5eb4b66f72366b275715fbf33b10ed764e6 (patch) | |
tree | 2aecacb2164b91f17c3d233059ca67b2b3dc05f1 /setup.cfg | |
parent | ed3c0b8e182c188e4d70883aeefb5e4b2b8cd054 (diff) | |
parent | f9404c52c0a5899f9b998e2b52d2316b65202414 (diff) |
Merge branch '1.15' into 1.16
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions