Merge branch 'master' into EmailAuth

.github/pull_request_template.md

@@ -13,6 +13,7 @@
 - [ ] No Conflicts
 - [ ] Change In Code
 - [ ] Change In Documentation
+- [ ] Follows linting rules
 
 ### Screenshots
 Before this PR            | After this PR

.github/workflows/android-release.yml

@@ -37,7 +37,7 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           # Adjust to the flutter version you are working with
-          flutter-version: "1.20.4"
+          flutter-version: "2.0.3"
       - name: Get version.txt
         uses: actions/download-artifact@v2
         with:

CONTRIBUTING.md

@@ -15,9 +15,11 @@ Please note we have a code of conduct, please follow it in all your interactions
 3. Increase the version numbers in any examples files and the README.md to the new version that this
    Pull Request would represent. 
    <!-- The versioning scheme we use is [SemVer](http://semver.org/). -->
-4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 
+4. Please make sure that your code follows the linting rules sufficiently.
+5. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 
    do not have permission to do that, you may request the second reviewer to merge it for you.
 
+
 ## Code of Conduct
 
-Check the code of conduct [here](https://github.com/himanshusharma89/relic_bazaar/blob/master/CODE_OF_CONDUCT.md).
+Check the code of conduct [here](https://github.com/himanshusharma89/relic_bazaar/blob/master/CODE_OF_CONDUCT.md).