projects / contrib / Conifer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2ede1d1 66e56a7)
Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into rel_2_7_mergery
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 04:08:44 +0000 (23:08 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 04:08:44 +0000 (23:08 -0500)
commit381edae15336f2f61081c38011b6b31d2f7631df
treeead8e2f6609fc8dbff6fd4f4f3fc15b18519c72btree
parent2ede1d169af4978c97e1d62a7b9c59958e6aca34commit | diff
parent66e56a7cb7c005382cdc512b7fa3b3fe0ee57b95commit | diff
Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into rel_2_7_mergery

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/src/templates/opac/parts/record/summary.tt2
Open-ILS/src/extras/install/Makefile.ubuntu-precise diff1 | diff2 | blob | history
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm diff1 | diff2 | blob | history
Open-ILS/src/templates/opac/parts/record/summary.tt2 diff1 | diff2 | blob | history
Evergreen contribs