As it's been a while with no movement, in the interest of getting this on a test server I've done a quick rebase (looks like the only conflict was over a single piece of whitespace): https://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/collab/khuckins/lp1264746_email_password_reset_button_rebase
As it's been a while with no movement, in the interest of getting this on a test server I've done a quick rebase (looks like the only conflict was over a single piece of whitespace): https:/ /git.evergreen- ils.org/ ?p=working/ Evergreen. git;a=shortlog; h=refs/ heads/collab/ khuckins/ lp1264746_ email_password_ reset_button_ rebase