diff options
author | chiiph <chiiph@chiiphs-MacBook-Air.local> | 2013-06-19 13:24:23 -0300 |
---|---|---|
committer | chiiph <chiiph@chiiphs-MacBook-Air.local> | 2013-06-19 13:24:23 -0300 |
commit | 898ac3c5d316a77f36a6fdaeb84a5e7044c43c23 (patch) | |
tree | ced628cb817d2f5782886ee1faa581202ab261f5 /docs/conf.py | |
parent | d88b91499e30d34afe4dfa3729890d3beb55fa31 (diff) | |
parent | 77b4ddbfbe6f6697520614a925ac83e605905ca2 (diff) |
Merge remote-tracking branch 'ivan/bug/windows_lockfiles_fix' into develop
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions