projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
Open-ILS/src/sql/Pg/upgrade/XXXX.editable_usr_circ_history.sql
Open-ILS/src/templates/opac/myopac/circ_history.tt2


Trivial merge
Evergreen ILS