old-git.evergreen-ils.org Git - evergreen/masslnc.git/commit

projects / evergreen / masslnc.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 02410ab 8ab6306)

author	Jim Keenan <jkeenan@cwmars.org>
	Tue, 24 May 2016 13:09:27 +0000 (09:09 -0400)
committer	Jim Keenan <jkeenan@cwmars.org>
	Tue, 24 May 2016 13:09:27 +0000 (09:09 -0400)
commit	5468816bd8ac75957234f05945530e087bb5b206
tree	dc60df3d0ff8c12e8bc65367b962e14ff34e4d9f	tree
parent	02410ab2a13a516a55f98b7d5d34e67b2a919059	commit \| diff
parent	8ab630642cf7331a3cbb3d216f376ff837e7ed52	commit \| diff

Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_branch

Conflicts:
Open-ILS/examples/fm_IDL.xml

Open-ILS/examples/fm_IDL.xml	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/cwopac_templates/opac/parts/misc_util.tt2	diff1 \|	\|	blob \| history

Evergreen working repo (MassLNC)