projects / evergreen / equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: caf3697 ad0bbbb)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 16:24:27 +0000 (12:24 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 16:24:27 +0000 (12:24 -0400)
1  2 
Open-ILS/web/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc Open-ILS/web/Makefile.am
Simple merge
Evergreen working repo (Equinox)