Closed cmshawns closed 11 years ago
I've merged with the BC dev branch and all other outstanding pull requests, so hopefully there won't be any conflicts this time.
@shawn-bellevuecollege and I had to merge this pull request manually using the command line tool. We couldn't find a conflict so we tested the version and merged the code.
I've merged with the BC dev branch and all other outstanding pull requests, so hopefully there won't be any conflicts this time.