Comment 17 for bug 1896285

Revision history for this message
Bill Erickson (berick) wrote :

Thanks Chris and Jeff.

Code merged to master and 3.6

I had a merge conflict in 3.5 that I was able to fix but unable to test, so I have pushed a separate branch for 3.5 in the hopes someone with 3.5 handy can give it a once over. Specifically, this commit resulted in the conflict:

https://git.evergreen-ils.org/?p=Evergreen.git;a=commitdiff;h=0a7eef2a73ddf43dd6dfd313980eb56419832415

3.5 Branch:

https://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/berick/lp1896285-batch-grid-actions-serialize-combo-3.5