old-git.evergreen-ils.org Git - working/Evergreen.git/commit

projects / working / Evergreen.git / commit

author	Galen Charlton <gmc@equinoxinitiative.org>
	Thu, 24 Aug 2017 21:39:43 +0000 (17:39 -0400)
committer	Galen Charlton <gmc@equinoxinitiative.org>
	Thu, 24 Aug 2017 21:39:43 +0000 (17:39 -0400)
commit	428c4bca83f2e5fd99f87471685d03d9c5f38b24
tree	48e6f2a58bea91576e15420acc1d163de29b58e2	tree
parent	ed74d3a738932f88bf7eaed4e68e727f898257ac	commit \| diff
parent	0ea20577353a094ab8a8cbf0f3362d739168534c	commit \| diff

Merge remote-tracking branch 'working/user/kmlussier/lp-1689608-patron_batch_edit_rebased' into user/gmcharlt/tmp-serials-batch-patron-edit-merge

Conflicts:
Open-ILS/src/templates/staff/circ/patron/index.tt2
Open-ILS/web/js/ui/default/staff/circ/patron/app.js

Evergreen ILS

RSS Atom

Open-ILS/examples/fm_IDL.xml	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/090.schema.action.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/staff/circ/patron/index.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/js/ui/default/staff/circ/patron/app.js	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/js/ui/default/staff/test/karma.conf.js	diff1 \|	diff2 \|	blob \| history