projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 729f117 21fd129)
Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Wed, 23 Dec 2015 20:23:13 +0000 (15:23 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 23 Dec 2015 20:23:13 +0000 (15:23 -0500)

Trivial merge
Evergreen contribs