projects / evergreen / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5468816 edaee08)
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_branch cwmars/jkeenan/working_branch
authorJim Keenan <jkeenan@cwmars.org>
Wed, 15 Jun 2016 16:20:26 +0000 (12:20 -0400)
committerJim Keenan <jkeenan@cwmars.org>
Wed, 15 Jun 2016 16:20:26 +0000 (12:20 -0400)
1  2 
Open-ILS/examples/fm_IDL.xml patch | diff1 | diff2 | blob | history

diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge
Evergreen working repo (MassLNC)