projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 12c6835 74f3130)
Merge branch 'user/dpearl/hist_edit' of git://git.evergreen-ils.org/working/Evergreen... user/dpearl/hist_edit
authorDan Pearl <dpearl@cwmars.org>
Wed, 23 Sep 2015 18:25:33 +0000 (14:25 -0400)
committerDan Pearl <dpearl@cwmars.org>
Wed, 23 Sep 2015 18:25:33 +0000 (14:25 -0400)
commit9b3b4d55c4b53fe23d5db57444aaf2406e6a4b98
tree135ce9feedf4b5475611b84f6fdd1255b08fe71ftree
parent12c6835d9087074ea21082570bbcb1ece22efe68commit | diff
parent74f313025a5ab2236469e0fca663b64fb3d1d879commit | diff
Merge branch 'user/dpearl/hist_edit' of git://git.evergreen-ils.org/working/Evergreen into hist_edit

Conflicts:
Open-ILS/src/sql/Pg/upgrade/XXXX.editable_usr_circ_history.sql
Open-ILS/src/templates/opac/myopac/circ_history.tt2
Evergreen ILS