Changeset 6ca9d90 in sasview for docs

Timestamp:
Apr 11, 2017 8:08:59 AM (8 years ago)
Author:
GitHub <noreply@…>
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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
97c60f8, 9c23f40
Parents:
a42fb8e (diff), b854587 (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.
git-author:
Andrew Jackson <andrew.jackson@…> (04/11/17 08:08:59)
git-committer:
GitHub <noreply@…> (04/11/17 08:08:59)
Message:

Merge pull request #86 from SasView?/pytest

URGENT: Logging conf file working! This was breaking master.

(No files)

Note: See TracChangeset for help on using the changeset viewer.