projects / evergreen / equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9f76a4 6227dcd)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Thu, 7 Jul 2011 14:13:04 +0000 (10:13 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 7 Jul 2011 14:13:04 +0000 (10:13 -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 (Equinox)