projects / evergreen / pines.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6237e06 99b6b1f)
Merge branch 'rel_2_5_1_kpac' of git://git.evergreen-ils.org/evergreen/pines into...
authorTerran McCanna <tmccanna@georgialibraries.org>
Tue, 29 Jul 2014 19:49:06 +0000 (15:49 -0400)
committerTerran McCanna <tmccanna@georgialibraries.org>
Tue, 29 Jul 2014 19:49:06 +0000 (15:49 -0400)
Conflicts:
Open-ILS/examples/kpac.xml


Trivial merge
Evergreen working repo (PINES)