2 Commits

Author	SHA1	Message	Date
Jason Carver	ac85506912	make merge script executable	2018-05-15 13:02:56 -07:00
Jason Carver	8815766abf	circleci: merge (and reattempt) PR before testing	2018-05-15 11:54:33 -07:00