Merge pull request #12340 from eileenmcnaughton/merge_cleanup
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 2 Jul 2018 09:33:41 +0000 (21:33 +1200)
committerGitHub <noreply@github.com>
Mon, 2 Jul 2018 09:33:41 +0000 (21:33 +1200)
Move DAO function to DAO class, call it from Merge class


Trivial merge