Test travis #14

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

2 commits

Author SHA1 Message Date
Benjamin Poldrack
0f7f030732 Merge remote-tracking branch 'gh-psyinf/master' into test-travis 2018-03-05 14:32:21 +01:00
Benjamin Poldrack
793c991a9e See what's going on 2018-03-05 14:30:21 +01:00