Skip to content

Commit

Permalink
Merge branch 'main' into fix/yarn-berry-and-fetch
Browse files Browse the repository at this point in the history
  • Loading branch information
devthejo committed Nov 6, 2023
2 parents 25627b7 + 153cb6a commit 5b05f52
Show file tree
Hide file tree
Showing 8 changed files with 2,506 additions and 4,625 deletions.
6 changes: 4 additions & 2 deletions .talismanrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
fileignoreconfig:
- filename: CHANGELOG.md
checksum: 3a76813c359d2cf2af2bdb5db40c4ccbc1f8a8ea00e0a1a9e51411f7d0534cb9
- filename: api/.yarnrc.yml
checksum: 99a0c6990e8edd0215ff7c4fcf69591c70ef19f2c83e412a599292ac357708cd
- filename: api/yarn.lock
checksum: 49a103a8c95426c1130039aa1d06d6ce25dbdc1b5c3d1639540cb46e50ee3781
- filename: app/ios/Podfile.lock
checksum: dcaf6d48f6e5fbd5e1eba52c4ddcdbb058170b00612ab4aeb862beeb5941d6a9
- filename: app/yarn.lock
checksum: 322b61343eb3804fad4090ba0c31f95b0f1e396cbc26f46246e0cffb41530c2e
checksum: f7c860d62847a8afae591234deb2d27d16c5d7426ec13232af43b86c857ac8a0
- filename: dashboard/.yarnrc.yml
checksum: 6b12c3fee90382d0b475cdd6e33b78871ba826a1e50564ee3ef4e2ab4100c3f6
- filename: dashboard/src/components/drawer.js
Expand All @@ -16,7 +18,7 @@ fileignoreconfig:
- filename: website/.yarnrc.yml
checksum: 67aa1e699cae0e970cd67128e0d83e792c2d589d96df8a1d2dd5e6cc8d40b64d
- filename: website/yarn.lock
checksum: 03d668b61941ce1ddbbbebac5090a7139e3f881002238d93215046a23d11760d
checksum: 4bf7fa50e92d07239ce49ded23921b1883f151c120bb9e3d8678f82cb3bd07b8
- filename: yarn.lock
checksum: f13434ac6f4d814b23e9eb7527c61e5acced02134a1eb6eed6a961f8b3dc63db
threshold: high
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [1.289.31](https://github.com/SocialGouv/mano/compare/v1.289.30...v1.289.31) (2023-11-06)


### Bug Fixes

* **deps:** update dependency @react-native-community/netinfo to v11 ([#1754](https://github.com/SocialGouv/mano/issues/1754)) ([4917567](https://github.com/SocialGouv/mano/commit/49175679119251666c4f8a66c7d3f0c0bc397560))

## [1.289.30](https://github.com/SocialGouv/mano/compare/v1.289.29...v1.289.30) (2023-10-27)


Expand Down
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "api_mano",
"version": "1.289.30",
"version": "1.289.31",
"mobileAppVersion": "2.37.4",
"description": "",
"main": "index.js",
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@expo/react-native-action-sheet": "^4.0.1",
"@react-native-async-storage/async-storage": "^1.17.11",
"@react-native-community/datetimepicker": "^6.7.1",
"@react-native-community/netinfo": "^9.3.7",
"@react-native-community/netinfo": "^11.0.0",
"@react-native-masked-view/masked-view": "^0.2.8",
"@react-native-picker/picker": "^2.4.8",
"@react-navigation/bottom-tabs": "^6.5.3",
Expand Down
306 changes: 36 additions & 270 deletions app/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dashboard/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dashboard",
"version": "1.289.30",
"version": "1.289.31",
"private": true,
"dependencies": {
"@babel/runtime": "^7.14.5",
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "website",
"version": "1.289.30",
"version": "1.289.31",
"mobileAppVersion": "2.37.4",
"private": true,
"engines": {
Expand Down
Loading

0 comments on commit 5b05f52

Please sign in to comment.