projects
/
working
/
Evergreen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7c24331
eaec26b
)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/lp1626157...
author
Bill Erickson
<berickxx@gmail.com>
Wed, 4 Apr 2018 17:31:59 +0000
(17:31 +0000)
committer
Bill Erickson
<berickxx@gmail.com>
Wed, 4 Apr 2018 17:31:59 +0000
(17:31 +0000)
1
2
Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
Simple merge