Daan Hoogland
a7d2d8d750
Merge release branch 4.17 to main
...
* 4.17:
marvin: newer python setuptools doesn't like -SNAPSHOT in marvin version (#7120 )
VR: fix warning Expected X answers while executing SetXXXCommand but Y (#7050 )
2023-01-24 16:08:32 +01:00
Rohit Yadav
abef381aa6
marvin: newer python setuptools doesn't like -SNAPSHOT in marvin version ( #7120 )
2023-01-24 15:28:07 +01:00
vivekcek
4abb8b9ebf
python command not working in ubuntu 20.04 for apidocs and marvin ( #6889 )
...
Co-authored-by: Vivek Ps <vivekcek@gail.com>
2022-11-30 09:12:03 +01:00
Leo Simons
2279289465
marvin: Fix marvin.sync profile, fixes regression from e10f8e8
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-13 11:15:41 +02:00
