projects / evergreen / pines.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 593f900 e966717)
Merge branch 'tags/rel_2_7_1' of git://git.evergreen-ils.org/Evergreen into rel_2_7_1
authorChris Sharp <csharp@georgialibraries.org>
Thu, 6 Nov 2014 18:19:33 +0000 (13:19 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Thu, 6 Nov 2014 18:19:33 +0000 (13:19 -0500)
Conflicts:
Open-ILS/src/templates/opac/parts/record/copy_table.tt2


Trivial merge
Evergreen working repo (PINES)