diff options
author | Sander Vrijders <sander.vrijders@ugent.be> | 2018-03-27 16:02:16 +0200 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-03-27 16:02:16 +0200 |
commit | eef25fb48735a5db9613bf00b47f6cf4703b815d (patch) | |
tree | a435ddc708338951dfa81d36189437f0b7dee80a /doc/conf.py | |
parent | 3e5a3aa56ab3652d43d845dac4abde1e1a2644e9 (diff) | |
parent | 69e8cfaf01a4d7ca5a58971d516cadf672016f77 (diff) | |
download | rumba-eef25fb48735a5db9613bf00b47f6cf4703b815d.tar.gz rumba-eef25fb48735a5db9613bf00b47f6cf4703b815d.zip |
Merge branch 'master' into testing
Diffstat (limited to 'doc/conf.py')
0 files changed, 0 insertions, 0 deletions