Merge branch 'angel' of https://github.com/openwfm/JPSSdata into angel
commit9d5068a0849532f20965a727e3d2f76a0023fe08
authorAngel Farguell Caus <angel.farguell@gmail.com>
Wed, 27 May 2020 16:54:29 +0000 (27 10:54 -0600)
committerAngel Farguell Caus <angel.farguell@gmail.com>
Wed, 27 May 2020 16:54:29 +0000 (27 10:54 -0600)
tree77f1c98cc54a9a5eb69590840c02e91695062633
parentd3da6c19fd22ccb803a27966a93aa5c5fac67bd1
parent2e9584e09141bfcccada03187d77efd9c4497852
Merge branch 'angel' of https://github.com/openwfm/JPSSdata into angel

Conflicts:
JPSSD.py
JPSSD.py