projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dd8a967 a22c60d)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into library_schema
authorDan Scott <dscott@laurentian.ca>
Mon, 16 Dec 2013 19:41:18 +0000 (14:41 -0500)
committerDan Scott <dscott@laurentian.ca>
Mon, 16 Dec 2013 19:41:18 +0000 (14:41 -0500)
commitf34cb3445709bb4c4e2a5a8f0610e6fdecb45f0c
treea28aafe310051907daf468e18bd0c0dcb36d5b5ftree
parentdd8a9675e3e2145883f8986cf3622e6f1ef5b1e4commit | diff
parenta22c60d395b9865f386a3d38aa6f6ed7aec05d22commit | diff
Merge branch 'master' of git.evergreen-ils.org:Evergreen into library_schema

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/src/templates/opac/parts/record/copy_table.tt2
Open-ILS/src/templates/opac/parts/record/copy_table.tt2 diff1 | diff2 | blob | history
Evergreen ILS