projects / contrib / pines / genasys.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 947a9ff d8cb228)
Merge branch 'master' of git.evergreen-ils.org:contrib/pines/genasys
authorMichael Peters <mpeters@emeralddata.net>
Wed, 9 Sep 2015 12:55:13 +0000 (08:55 -0400)
committerAndy Witter <awitter@georgialibraries.org>
Wed, 9 Sep 2015 12:55:13 +0000 (08:55 -0400)
Conflicts:
GenaSYS.sh
templates/debs/evergreen-ils_2.7.1a_amd64.deb

1  2 
GenaSYS.sh patch | diff1 | diff2 | blob | history
templates/setup-head.sh patch | diff1 | diff2 | blob | history

diff --cc GenaSYS.sh
Simple merge
diff --cc templates/setup-head.sh
Simple merge
GenaSYS