Ecosyste.ms: OpenCollective

An open API service for software projects hosted on Open Collective.

github.com/openfoodfacts/openfoodfacts-dart

Open Food Facts API Wrapper
https://github.com/openfoodfacts/openfoodfacts-dart

feat: #379 - added packaging_text_XX (#380)

Impacted files:
* `api_getProduct_test.dart`: added "packaging text in languages" test
* `Prod...

cf492c54275424c184457884e951289512de3591 authored almost 3 years ago by monsieurtanuki <[email protected]>
chore(master): release 1.12.0 (#373)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

3bc58281a52a777862a8f3e212c71fb28286a734 authored almost 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
feat: #370 - added "uuid" to configuration (#378)

Impacted files:
* `configuration_test.dart`: added tests with "uuid"
* `HttpHelper.dart`: incl...

2be52e064c42c460ca453461e1ebdaece5b58177 authored almost 3 years ago by monsieurtanuki <[email protected]>
build(deps): bump JamesIves/github-pages-deploy-action (#377)

Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-ac...

e3002aabaf1065349a43981b137cf5098ed5a702 authored almost 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
feat: #370 - added app_name and app_version to http queries (as parameters) (#376)

Impacted files:
* `configuration_test.dart`: added test for user agent; refactored
* `HttpHelp...

d4c6ef9f46eb8cf51e66d70f2b5838b8b8a8e12b authored almost 3 years ago by monsieurtanuki <[email protected]>
feat: #369 - more flexibility for product query version (#374)

Impacted files:
* `api_getProduct_test.dart`: refactored
* `openfoodfacts.dart`: refactored
*...

51fdebcc46b0fea4bba69cef50817da9b0ef970f authored almost 3 years ago by monsieurtanuki <[email protected]>
feat: #348 - new methods getTaxonomyTranslationUri and getCrowdinUri (#372)

Impacted files:
* `api_getProduct_test.dart`: tests for new methods `getTaxonomyTranslationUri`...

057e0a30b6c824722c733c4d63ca63bd8cccc434 authored almost 3 years ago by monsieurtanuki <[email protected]>
feat: new method getProductString, api V0 and V2, new product and ingredient fields (#371)

Impacted files:
* `api_getProduct_test.dart`: refactored the ecoscore html test; added a knowle...

82547f63a3c4e59cd6f30c1c018cf5c8d13d0b45 authored almost 3 years ago by monsieurtanuki <[email protected]>
Switch from 'type' to 'tagtype' in the taxonomy API (#368)

The taxonomy API changed from specifying the type of taxonomy using "type" to using "tagtype". T...

b0932fef74ed3e44e5a482a3d4e70a0d691de2dd authored almost 3 years ago by Greg Spencer <[email protected]>
chore(master): release 1.11.1 (#367)

85d7eef59baa2e58941ae5454bfab25a50c0a563 authored almost 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
fix: Rename enum so it doesn't conflict with Size class from geometry.dart (#366)

* KP: Parse Size from server response

* ...

* Rename enum so it doesn't conflict with Size cl...

527b2e7ea484839ccfc9bb6ffc812b3d966e0924 authored almost 3 years ago by jasmeet0817 <[email protected]>
chore(master): release 1.11.0 (#365)

f1352805a00debb117d1d6c594b711cd781132ae authored almost 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
feat: KP: Parse Size from server response (#364)

3d402b7d93e310ae8b31dd18b02b98db695dc9a1 authored almost 3 years ago by jasmeet0817 <[email protected]>
chore(master): release 1.10.0 (#363)

5be55c2c9eb8d45be20edc80a5b2c2877b70ec39 authored almost 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
feat: new method "getOrderedNutrientsJsonString" (#362)

The point (for apps) is to retrieve that string, store it locally, and refresh it from the API w...

516ccfa40063aa4d15d1e032438ea1073c945de6 authored almost 3 years ago by monsieurtanuki <[email protected]>
build(deps): bump JamesIves/github-pages-deploy-action (#361)

Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-ac...

000725f598c61fed5be6d5dc750f516778ecbfa0 authored almost 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
chore(master): release 1.9.1 (#359)

* chore(master): release 1.9.1

* Update CHANGELOG.md

Co-authored-by: github-actions[bot] <...

9a524aed14a6c1b881566ee4676122e975a05e8a authored about 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
fix: #357 - added forgotten "toJson: UnitHelper.unitToString"s (tons of them!) (#358)

Impacted files:
* `api_saveProduct_test.dart`: added vitamin B12 + unit to a "save and check" t...

9eb2872b0754c193b0c07f66f2da0331e4ffc23b authored about 3 years ago by monsieurtanuki <[email protected]>
chore(master): release 1.9.0 (#352)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

748f6315c6a6f517d709e41b15b5b64a139ce897 authored about 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Update KnowledgePanel columns as per server response (#355)

Co-authored-by: Jasmeet Singh <[email protected]>

3153c856f970217ea50abb6227bf4c5772f632f3 authored about 3 years ago by jasmeet0817 <[email protected]>
build(deps): bump JamesIves/github-pages-deploy-action (#356)

Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-ac...

f871db5fe6fc2eb81bbcf3a65cea8a800a0b1301 authored about 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
build(deps): bump JamesIves/github-pages-deploy-action (#353)

Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-ac...

88077ea6c80c4f7465dcfa66d9e680d36129abc5 authored about 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
feat: #350 - new method getProductFreshness (#351)

New file:
* `ProductFreshness.dart`: Freshness of a `Product`.

Impacted files:
* `api_searc...

979c6afca50aecfe58d0094f9873926dd0ce1fde authored about 3 years ago by monsieurtanuki <[email protected]>
build(deps): bump GoogleCloudPlatform/release-please-action from 2 to 3 (#347)

Bumps [GoogleCloudPlatform/release-please-action](https://github.com/GoogleCloudPlatform/release...

47258f2b86342d0729df3d0fe6afb1ff6009735c authored about 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
chore: release 1.8.1 (#344)

05a0de087425db9ca10e67722750853acefe1f82 authored about 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
fix: Lowercased country code (#343)

Impacted files:
* `api_saveProduct_test.dart`: unrelated - raised time out for "save" tests
* ...

bdf645197a81e40c357bd126e09986d195f96e05 authored about 3 years ago by monsieurtanuki <[email protected]>
Fix Smoothie build dependency conflict (#341)

87ad9933dcf489dd25999f84eb52d0b2e66ef195 authored about 3 years ago by jasmeet0817 <[email protected]>
build(deps): bump actions/labeler from 2 to 3.0.2 (#340)

Bumps [actions/labeler](https://github.com/actions/labeler) from 2 to 3.0.2.
- [Release notes](h...

f90feda871203d2ae4712b5311d1cd2fb250b47f authored about 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
chore: release 1.8.0 (#333)

* chore: release 1.8.0

* Update CHANGELOG.md

Co-authored-by: github-actions[bot] <41898282...

dabdebeb613cd3ac8c4bd144a494503dc764ede4 authored about 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
build: pubspec dependencies refresh (#336)

Impacted files:
* `EcoscoreData.g.dart`: slightly different generated code
* `HttpHelper.dart`...

ee4f9cdcffe1fbd63df1dbd09707ba574ba07a02 authored about 3 years ago by monsieurtanuki <[email protected]>
Start PR labelling automation (#337)

* Start PR labelling automation

Start PR labelling automation

* Create labeler.yml

* Update l...

be46739d52cfdfb724479f58068cceb6506714bf authored about 3 years ago by Pierre Slamich <[email protected]>
feat: #158 - introduction to folksonomy (#332)

New files:
* `api_folksonomy_test.dart`: Tests around folksonomy
* `api_saveProduct_test.dart`...

f7b254e80a339c37ce85a1ad7d9f8bc9978be9d8 authored about 3 years ago by monsieurtanuki <[email protected]>
build(deps): bump JamesIves/github-pages-deploy-action (#334)

Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-ac...

208bc202a87094e3603ff79f8a2fd012292c68c0 authored about 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
feat: Added globalUser to OpenFoodAPIConfiguration (#329)

* feat: Added globalUser to OpenFoodAPIConfiguration

* Code review

e246d9ea34bc271bd0f6a5a507b3b44c4e492cc1 authored about 3 years ago by Marvin M <[email protected]>
Fix: Added missing product fields to ProductField enum (#331)

* fix: Added missing arguments to ProductField

* Update Product.dart

* Added tests

* fi...

4bbd66c4d5b1b6e9be460029598125e0e519e2f1 authored about 3 years ago by Marvin M <[email protected]>
style: Removed unnecessary appearances (#330)

8910b5a16e99f26bb8c9e94279f6068e53cb7fa8 authored about 3 years ago by Marvin M <[email protected]>
fix: Don't pass country code if it's null (#324)

5f9447c474e1a8a5ea9dc18233b2df8374c7bd6c authored about 3 years ago by jasmeet0817 <[email protected]>
chore: release 1.7.0 (#322)

d67fe48a76830d8886ef48398ca8e6e6bfcb9469 authored about 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Process map elements in knowledge panel (#323)

3f6149f9c0997a70d8577af871936bb3a0fe3df5 authored about 3 years ago by jasmeet0817 <[email protected]>
feat: #306 - unselect product image, added "user" parameter to WRITE methods (#319)

Impacted files:
* `api_addProductImage_test.dart`: new test about "unselect product image"; ref...

1c82e33a313afd3c4908cf95f96d58f7f738ca1e authored about 3 years ago by monsieurtanuki <[email protected]>
chore: release 1.6.0 (#315)

1fb3dbb7c3eb8f4e0fdb99441ea41202b59fb326 authored about 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Remove obsolete test (#321)

d322c9abbb57449fed7f3def6d873e3aa16f0d75 authored about 3 years ago by jasmeet0817 <[email protected]>
fix: Release workflow (#312)

* 1

* 1.1

* feat: Updated release workflow

* fix: Updated dartdoc workflow to not run on fork...

68c61bad664186109f819c422d91866be907bd39 authored about 3 years ago by Marvin M <[email protected]>
feat: Allow to get OpenFoodFactsCountry from countryCode (#314)

* feat: Allow to get OpenFoodFactsCountry from countryCode

* Added comment

* feat: New Cou...

8b6c9bc956b716fea16ffc198f62421973665caf authored about 3 years ago by Marvin M <[email protected]>
generate automatically generated json parser files (#317)

44d315058ccf07890630f72f2d8bd17e14ace5e9 authored about 3 years ago by jasmeet0817 <[email protected]>
use KnowledgePanelElementType.UNKNOWN as default value when a value it's not present (#316)

8850223d5f5b1fe8af7588b84b1a00638ab909d7 authored about 3 years ago by jasmeet0817 <[email protected]>
feat: #307 - added 21 enum values for advanced search parameters (#313)

Impacted files:
* `api_searchProduct_test.dart`: additional tests on all `TagFilterType`s; refa...

55f3fa583a535ec842db87067019ed2933f75a78 authored about 3 years ago by monsieurtanuki <[email protected]>
fix: Parsing of Grade Json field (#311)

Co-authored-by: Jasmeet Singh <[email protected]>

2da4d276d5e94d3a1d92a35105d8d1c4a287709c authored about 3 years ago by jasmeet0817 <[email protected]>
chore: release 1.5.0 (#308)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

00cb3e96e69419357e9aed81f8a7fc99bcb52e47 authored about 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
feat: #304 - new method setProductImageAngle and setProductImageCrop (#309)

Deleted file:
* `corn_da.jpg`

Impacted files:
* `api_addProductImage_test.dart`: added test...

c69f3f639f47291a007185c59c89b652bbf52098 authored about 3 years ago by monsieurtanuki <[email protected]>
feat: #301 - new method getProductUri (#302)

Impacted files:
* `api_getProduct_test.dart`: new test "get product uri"
* `api_saveProduct_te...

85169f083ad7bc1c83c67e817de32a942700eb92 authored about 3 years ago by monsieurtanuki <[email protected]>
Bump JamesIves/github-pages-deploy-action from 4.1.6 to 4.1.7 (#303)

Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-ac...

0bfef3f50755a53b8dba7849789ff19f79ac0bbc authored about 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
chore: release 1.4.0 (#300)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

55cc2dd21e539f0200c9f96a2caf2610334f3b39 authored about 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
feat: #233 - new class OpenFoodFactsCountry, clearer than "cc" (#292)

New file:
* `CountryHelper.dart`: country enums and their ISO-2-codes

Impacted files:
* `Ab...

3dda3f46e290c71bb6cb23e553163d62ea9159fb authored about 3 years ago by monsieurtanuki <[email protected]>
Bump JamesIves/github-pages-deploy-action from 4.1.5 to 4.1.6 (#299)

Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-ac...

b26733e497c4c325a9fc2d07f90e1dfeddc9c514 authored about 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
prepare release 1.3.9 (#298)

d6d6b33b1467e3ae31c1d649b15e9112cedc9cb6 authored about 3 years ago by Stéphane Gigandet <[email protected]>
chore: release 1.3.9 (#281)

* chore: release 1.3.9

* Update CHANGELOG.md

Co-authored-by: github-actions[bot] <41898282...

a920fc304c8cc7596bb508ca95503a631aa99838 authored about 3 years ago by github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CD: Renamed workflow (#297)

To avoid confusion that we release on every commit

0d048362ee686083b897d760dcb119c7c3511587 authored about 3 years ago by Marvin M <[email protected]>
CD: Added release workflow (#293)

* ci: simplified duplicate run protection

* cd: created release workflow

5f2d90f9b3771601419c8d3bdb5bc08ce396f670 authored about 3 years ago by Marvin M <[email protected]>
Add changes that were missed in #294 (#296)

Co-authored-by: Jasmeet Singh <[email protected]>

d089a740a8ab1051d55fcdaa9cf0fd27442b62ff authored about 3 years ago by jasmeet0817 <[email protected]>
fix: Update to latest KnowledgePanel API changes (#294)

5163db593f89631e922c3c2085809ef60b3a42d9 authored about 3 years ago by jasmeet0817 <[email protected]>
feature_2/#191 - added eco-score and nutri-score categories (ProductImprovement) (#288)

Impacted file:
* `Product.dart`

797339d4436cf4f715cf0a2cc9283d070cd2cc92 authored about 3 years ago by monsieurtanuki <[email protected]>
feature_2/#210 - add nutrient order and list (#272)

Impacted files:
* `openfoodfacts.dart`: created method `getOrderedNutrients`
* `ordered_nutrie...

a70840765d3efbdd5c5e0c16a109def010748c8e authored about 3 years ago by monsieurtanuki <[email protected]>
feature/#104 - support for the new "Image Refresh" API (#289)

Impacted files:
* `Product.dart`: added a dedicated field and its computing method
* `ProductF...

be74dd40c5c85e102d7bcda555ebd68cb5471492 authored about 3 years ago by monsieurtanuki <[email protected]>
Add queries to get the roots from the server (#287)

This adds parameters to the Taxonomy queries that have hierarchies (Category, Ingredient, Label)...

ad4d82979192276f138a32ae078ea5f039aacdae authored about 3 years ago by Greg Spencer <[email protected]>
test fix (#285)

Impacted files:
* `api_addProductImage_test.dart`: renamed tests
* `api_saveProduct_test.dart`...

a4d3c36160910a9e3948ac7bfabe9e5532c90656 authored about 3 years ago by monsieurtanuki <[email protected]>
Send deviceId to InsightAnnotations API and allow anonymous user (#286)

3a5211d5b682731e1ad0c789dbf0e0b497f23530 authored about 3 years ago by jasmeet0817 <[email protected]>
Add additives, countries, and languages taxonomy APIs (#278)

Similar to #277, this adds the rest of the taxonomies that are available from the server at the ...

c3d600b2e28ccde2d797be0eae51ce9d101ac53b authored about 3 years ago by Greg Spencer <[email protected]>
fix/#223 - refactored the use of QueryType (#274)

Rehabilitated most of robotoff tests and refactored "en passant" the use of `QueryType`.

Abou...

f6136a6bef974e881621fb46bda63c7e4b37df20 authored about 3 years ago by monsieurtanuki <[email protected]>
Fix RobotoffQuestionsForProduct API (#283)

18fe40657ac18840634915bf812a1ac8bcd58078 authored about 3 years ago by jasmeet0817 <[email protected]>
Add a taxonomy API for labels (#277)

This adds an API for fetching the labels taxonomy from the server using the taxonomy server API,...

5e74a55181b7fc7ea6caec0e80edbbdf39b365b2 authored about 3 years ago by Greg Spencer <[email protected]>
fix: Delete release.yml + added needed package to pubspec (#280)

* Delete release.yml

* Added meta package

a0f5c7c4d96588f6acc8e2b4f1a5606edf7178b9 authored about 3 years ago by Marvin M <[email protected]>
Prepare 1.3.8 release (#279)

65b9742bd4445f68b5fb403378186a4d857b93ff authored about 3 years ago by jasmeet0817 <[email protected]>
Changes to KnowledgePanel API (#276)

f7fb423d525e46da894e7914724b50cb736d7f16 authored about 3 years ago by jasmeet0817 <[email protected]>
Column should have String `text` and `type` instead of List<String> (#273)

73ea39df211b429ac399c2d61a3c4647e3449a8d authored about 3 years ago by jasmeet0817 <[email protected]>
feature/#210 - add nutrient order and list (#271)

Thanks to @peterwvj and @jasmeet0817!

New files:
* `ordered_nutrient_test.dart`: Tests relat...

787bdd40ffc6b237553e512b6890eec1a6d43ac0 authored about 3 years ago by monsieurtanuki <[email protected]>
Add Taxonomy fetching for Categories, Allergens, and Ingredients. (#262)

9cf1d12338e9e25711e821c8ff07cc703c213b6e authored about 3 years ago by Greg Spencer <[email protected]>
Prepare release of version 1.3.7 (#270)

1fef1486db51a85ca32e7d616c014bf0a35bdd3f authored about 3 years ago by jasmeet0817 <[email protected]>
Comply to latest BE changes to KnowledgePanels (#269)

9dec6f894b336e333984591a584ba589b3e78ad1 authored about 3 years ago by jasmeet0817 <[email protected]>
Add `name` to KnowledgePanel (#264)

6751726949055f53d7178cc55897b212a3a6944a authored about 3 years ago by jasmeet0817 <[email protected]>
build: prepare release of version 1.3.6 of the SDK (#268)

1d579e1ed342c792d06488ca428bc324d2dd6281 authored about 3 years ago by Peter W. V. Tran-Jørgensen <[email protected]>
fix: Nutriments JSON conversion bug related to micro gram unit (#267)

Closes #265

9123647115e6a4df7fffbeeb697c204315e06ff7 authored about 3 years ago by Peter W. V. Tran-Jørgensen <[email protected]>
fix: relax and correct test assertions (#266)

bde86da2ef2cb3229cb48c097994842a300e2e37 authored about 3 years ago by Peter W. V. Tran-Jørgensen <[email protected]>
Merge pull request #261 from gspencergoog/fix_warnings

This just fixes all the lint warnings: no functionality changes.

d307350ef2e5370974688a4b8de428ce738ff128 authored over 3 years ago by Greg Spencer <[email protected]>
New recommended linting rules (#252)

* Added dart:lints

* Refactoring for new linting rules

* Update Status.dart

* Update op...

9329bb83d45ecc849552dc3c266b4e6f15fe193b authored over 3 years ago by Marvin M <[email protected]>
Update KnowledgePanel to comply to latest BE changes (#259)

eb872636716c51d73f54ee41812887e007ba588f authored over 3 years ago by jasmeet0817 <[email protected]>
Fix lint warnings

6f5b3a603782009ae3c41db79c220ae66074f753 authored over 3 years ago by Greg Spencer <[email protected]>
Revert back to 9ca5fab (#258) Part 2

099b57df745d698daafa4717a1ac51c5bc222189 authored over 3 years ago by jasmeet0817 <[email protected]>
Reverting back to 9ca5fab7ebb0171d6bc87889761bba26805d99eb (#257)

150205ed933fb8d02432c393156a7fcf529d2431 authored over 3 years ago by jasmeet0817 <[email protected]>
Merge branch 'master' into master

06b81d9f53f4b9a4e2efd76e6a5df7a92b8aaf27 authored over 3 years ago by jasmeet0817 <[email protected]>
Updates to KnowledgePanel json object to comply to latest BE changes

63c9f477d21e12402274ebdbd302aba098b9d1dd authored over 3 years ago by Jasmeet Singh <[email protected]>
Updates to KnowledgePanel json object to comply to latest BE changes

a992065ca30e8dbd35eb675942204cf1c912b82c authored over 3 years ago by Jasmeet Singh <[email protected]>
Add 'page', 'pageSize' and 'sortOption' to ProductListQueryConfiguration (#253)

9ca5fab7ebb0171d6bc87889761bba26805d99eb authored over 3 years ago by Danil <[email protected]>
Rename parent_panel_id field to comply to Lint rules (#255)

e1bdf980c7ac492a98e798277a21073cdfbd9442 authored over 3 years ago by jasmeet0817 <[email protected]>
Added support for password reset (#254)

* Added support for password resets

* Update user_management_test.dart

* Update Status.dart

*...

43a566407af26dc531c1b141dcac1fc8bc561201 authored over 3 years ago by Marvin M <[email protected]>
Rename parent_panel_id field to comply to Lint rules

b69033e0b89c02e76a607e2041f4f0f0d8ba756a authored over 3 years ago by Jasmeet Singh <[email protected]>
Revert Permanent Attributes

b73ea522ef482a4616a9e06e49e41d3bb3ae7696 authored over 3 years ago by Jasmeet Singh <[email protected]>
Add Permanent_attributes to Attribute.dart, user will always see these attributes on product page and can't toggle them off

472d9aa283a4cf74a17ec37b332f467fddae0892 authored over 3 years ago by Jasmeet Singh <[email protected]>
Merge pull request #2 from openfoodfacts/master

Merge conflicts

7e134fb2a3c45f38c0d73fcf1f7163bb59b5d15d authored over 3 years ago by jasmeet0817 <[email protected]>
Merge branch 'master' into master

6ae39a82fc09b2220e71dfd963d06dc5468aa7ab authored over 3 years ago by jasmeet0817 <[email protected]>