9 Commits

Author	SHA1	Message	Date
Carl Beekhuizen	26afa077fd	Resolves conflicts and merges in dev	2019-04-18 23:17:53 +02:00
Carl Beekhuizen	cb5c95b84e	Fixes tests	2019-04-18 12:35:22 +02:00
Justin	6975288254	Merge branch 'dev' into carl-patch-1	2019-04-18 17:52:56 +10:00
Danny Ryan	8c5f7a571d	Merge branch 'dev' into prev-cur-crosslinks	2019-04-17 20:27:25 -06:00
Danny Ryan	c783cdb2f4	fix bug and add transfer tests	2019-04-17 12:31:00 -06:00
Danny Ryan	d118eb03c9	Merge branch 'dev' into carl-patch-1	2019-04-17 11:18:29 -06:00
Danny Ryan	2cb8f1c520	Merge branch 'dev' into start-at-zero	2019-04-17 08:39:25 -06:00
Danny Ryan	ef14396532	Merge branch 'dev' into prev-cur-crosslinks	2019-04-17 08:33:13 -06:00
protolambda	90cf8738bf	Move pytests for faster dev iteration	2019-04-17 17:47:56 +10:00