|
Sandeep Puthanveetil Satheesan
|
1f116dbe77884eac393e10d4ab337fefb195d0e5
|
Fix merge conflicts. |
|
|
Sandeep Puthanveetil Satheesan
|
efe3218a0c04df6f3a36331af971b29430d11690
m |
Get latest SQX file after uploading. |
|
|
Sandeep Puthanveetil Satheesan
|
bf0e5b1929b165eeb8d9bbc88947f09c35cf4be4
m |
Merge and update CHANGELOG. |
|
|
Sandeep Puthanveetil Satheesan
|
5e147c1b9edeac3ade09d814f0425e2cde587443
m |
Merge branch 'develop' into feature/CCROP-293-change-uploading-farm-data-to-support-an-sqx-file |
|
|
Sandeep Puthanveetil Satheesan
|
602cbf7e0441ffc99b47934abf78e5b81714eb28
m |
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/bitbucket/scm/ccrop/cover-crops into develop |
|