Merge branch 'angel' of https://github.com/openwfm/JPSSdata into angel
commit2e9584e09141bfcccada03187d77efd9c4497852
authorAngel Farguell Caus <angel.farguell@gmail.com>
Wed, 27 May 2020 16:49:15 +0000 (27 10:49 -0600)
committerAngel Farguell Caus <angel.farguell@gmail.com>
Wed, 27 May 2020 16:49:15 +0000 (27 10:49 -0600)
treedfad6a82925d19cafa63fc92bcfd8d046ec70a84
parentc2ccdf25a9b7fed64569b89e6eb1a492c7efb9d4
parent17a0f12203aaa644c2a5733f342ed2883d9664d7
Merge branch 'angel' of https://github.com/openwfm/JPSSdata into angel

Conflicts:
saveload.py
process.py