projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d692821 378be91)
Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Thu, 19 Mar 2015 11:16:58 +0000 (07:16 -0400)
committerDan Scott <dscott@laurentian.ca>
Thu, 19 Mar 2015 11:16:58 +0000 (07:16 -0400)
Conflicts:
Open-ILS/src/templates/marc/OSUL_Journal_Electronic.xml


Trivial merge
Evergreen contribs