diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-23 18:57:13 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-23 18:57:13 -0700 |
| commit | a0bf23a25c39d5c4d61dda29b60b04c1a6fd1c41 (patch) | |
| tree | 14a49408fd2d4248e8ce45650d9c73435f8522af /setup.cfg | |
| parent | 294bc5eb4b66f72366b275715fbf33b10ed764e6 (diff) | |
| parent | c312b620e7945797468702aeb27cb58def3f0f80 (diff) | |
Merge branch '1.15' into 1.16
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions