diff options
author | Kali Kaneko <kali@leap.se> | 2014-08-21 13:58:15 -0500 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2014-08-21 13:58:15 -0500 |
commit | 804a0b388a8d0fc4e03ec2c525f277d5eabaae7f (patch) | |
tree | aded7741daed22b3975abe40b662cf3be1115493 /docs/api/conf.py | |
parent | 910b86b3f7fecc760d5da02ef89ac1d6fd62299c (diff) | |
parent | 53861af18ecf36dfebb9ae56c5b412dd1be0dd78 (diff) |
Merge remote-tracking branch 'bwagner-github/fix_tests_on_mac' into develop
Diffstat (limited to 'docs/api/conf.py')
0 files changed, 0 insertions, 0 deletions