diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2022-05-20 15:10:35 -0400 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2022-05-20 15:10:35 -0400 |
commit | 2b32b402c5f574699fe43b4d6b6f2b645e26849e (patch) | |
tree | e02305b079b22c334ec2624063f93be099b7857e /pytest.ini | |
parent | 50d33223f9ec9e308a3fda519b36f78be859c4bc (diff) | |
parent | ddba5762c9c0878b83fb6a7344ad24ba74af5720 (diff) |
Merge branch '2.10' into 2.11
Diffstat (limited to 'pytest.ini')
0 files changed, 0 insertions, 0 deletions