RS 64b627af0d Merge branch 'master' of http://git.eanbo.cn/baoliang/drought ... # Conflicts: # dashboard/templates/dashboard/spi_chart.html		2018-07-09 19:06:28 +08:00
..
predict	Merge branch 'master' of http://git.eanbo.cn/baoliang/drought	2018-07-09 19:06:28 +08:00