Test travis #15

Merged
bpoldrack merged 2 commits from test-travis into master 2018-03-05 13:50:32 +00:00

2 commits

Author SHA1 Message Date
Benjamin Poldrack
5a51be097d Merge remote-tracking branch 'gh-psyinf/master' into test-travis 2018-03-05 14:45:38 +01:00
Benjamin Poldrack
02da37ca2a Travis sucks 2018-03-05 14:44:45 +01:00