Merge remote-tracking branch 'origin/master'

This commit is contained in:
Manuele Simi 2019-07-13 15:12:39 -04:00
commit 5b2847568c
1 changed files with 3 additions and 1 deletions

View File

@ -64,7 +64,9 @@ The projects leading to this software have received funding from a series of Eur
- the Seventh Framework Programme for research, technological development and demonstration - the Seventh Framework Programme for research, technological development and demonstration
- D4Science (grant no. 212488), D4Science-II (grant no.239019), ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine(grant no. 283644); - D4Science (grant no. 212488), D4Science-II (grant no.239019), ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine(grant no. 283644);
- the H2020 research and innovation programme and D4Science.org - the H2020 research and innovation programme and D4Science.org
- BlueBRIDGE (grant no. 675680), EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant no. 654119), SoBigData (grant no. 654024); DESIRA (grant no. 818194); ARIADNEplus (grant no. 823914); RISIS2 (grant no. 824091); PerformFish (grant no. 727610) - BlueBRIDGE (grant no. 675680), EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant no. 654119), SoBigData (grant no. 654024), DESIRA (grant no. 818194), ARIADNEplus (grant no. 823914), RISIS2 (grant no. 824091), PerformFish (grant no. 727610), AGINFRAplus (grant no. 731001)
## Acknowledgments ## Acknowledgments
* Hat tip to anyone whose code was used * Hat tip to anyone whose code was used