projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8294750 61a9587)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
authorDan Scott <dscott@laurentian.ca>
Wed, 1 Aug 2012 21:04:16 +0000 (17:04 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 1 Aug 2012 21:04:16 +0000 (17:04 -0400)
Conflicts:
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/templates/opac/parts/record/summary.tt2
Open-ILS/src/templates/opac/parts/result/table.tt2

Signed-off-by: Dan Scott <dscott@laurentian.ca>

Trivial merge
Evergreen contribs