projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52c7e0c 7684283)
Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Sat, 14 Mar 2015 22:34:30 +0000 (18:34 -0400)
committerDan Scott <dscott@laurentian.ca>
Sat, 14 Mar 2015 22:34:30 +0000 (18:34 -0400)
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/src/templates/opac/parts/misc_util.tt2
Open-ILS/src/templates/opac/parts/record/body.tt2


Trivial merge
Evergreen contribs