Merge latest_staging into ac-6, resolve merge conflicts - Githubissues

FusionIIIT / Fusion

Currently merged : Ac-1 Ac-2 Ac-3 Ac-5 Ac-7 Os-1 Os-2 Os-3 Gad-1 Gad-2 Gad-6 Gad-7

Other

47 stars 973 forks source link

Merge latest_staging into ac-6, resolve merge conflicts #1586

Closed rush1kesh-010 closed 6 months ago

rush1kesh-010 commented 6 months ago

Issue that this pull request solves

Merges latest_staging branch with ac-6 and prepares it for deployment

Brief description of what is fixed or changed

Merge conflicts have been resolved Branch is up to date with latest changes

Types of changes

Put an x in the boxes that apply

[x] Bugfix (non-breaking change which fixes an issue)
[ ] New feature (non-breaking change which adds functionality)
[ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
[ ] Other (please describe):

Checklist

Put an x in the boxes that apply

[x] My code follows the style guidelines of this project
[x] I have performed a self-review of my own code
[ ] I have created new branch for this pull request
[x] I have commented my code, particularly in hard-to-understand areas
[ ] I have made corresponding changes to the documentation
[x] My changes generate no new warnings
[x] My changes does not break the current system and it passes all the current test cases.

prabhatsuman commented 6 months ago

@prajjwalkapoor why are there changes in the IWD module and some changes in the migration initial.py, Please remerge with latest_staging