Changeset f80b416e in sasview for docs/sphinx-docs/source/conf.py


Ignore:
Timestamp:
Sep 20, 2017 12:21:41 PM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
fca1f50
Parents:
2746eab (diff), ce0a245 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into ticket-639-katex

File:
1 edited

Legend:

Unmodified
Added
Removed

  • docs/sphinx-docs/source/conf.py

    r96f00a0 rf80b416e  
    8080version = '4.1' 
    8181# The full version, including alpha/beta/rc tags. 
    82 release = '4.1.0' 
     82release = '4.1.2' 
    8383 
    8484# The language for content autogenerated by Sphinx. Refer to documentation 
Note: See TracChangeset for help on using the changeset viewer.