diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-01-24 09:16:27 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-01-24 09:16:27 -0800 |
| commit | 4b01ee37609bf9cdf1ea7f3944f5a9265504c990 (patch) | |
| tree | f68a8f98a8be29fa03c32c700a1928c65023b32a /setup.cfg | |
| parent | 9a7922a727007ade0b8748b38930f8e01a74729e (diff) | |
| parent | 208922af5a2be81d7bae2b9e2e4a3475b535593c (diff) | |
Merge branch '2.0' into 2.1
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions