summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/conf.py
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-11-15 13:37:24 +0100
committerAndrey Andreev <narf@devilix.net>2017-11-15 13:37:24 +0100
commit432a9130059873551d1cff3e40d1d8432f552b96 (patch)
treeaabda9878719055ea2ab6c375c29dacb792b5f2f /user_guide_src/source/conf.py
parent212df3650c30ce93219168d3305f374d8b8ece37 (diff)
parentee8324368f2844aae0d558f1d194419a2181c281 (diff)
Merge branch '3.1-stable' into develop
Note: This intentionally reverts ee8324368f2844aae0d558f1d194419a2181c281
Diffstat (limited to 'user_guide_src/source/conf.py')
0 files changed, 0 insertions, 0 deletions