Skip to content

Commit

Permalink
Merge remote-tracking branch 'Altme/TALAO' into dev-talao
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkbee1 committed Mar 20, 2023
2 parents a0c3cd4 + abbf035 commit c0071d0
Show file tree
Hide file tree
Showing 243 changed files with 7,799 additions and 3,447 deletions.
2 changes: 1 addition & 1 deletion .fvm/fvm_config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"flutterSdkVersion": "3.3.9",
"flutterSdkVersion": "3.7.7",
"flavors": {}
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ flutter_*.png
linked_*.ds
unlinked.ds
unlinked_spec.ds
.fvm/
.fvm/flutter_sdk

# Android related
**/android/**/gradle-wrapper.jar
Expand Down Expand Up @@ -133,3 +133,4 @@ app.*.map.json

#private key related
*.env
*.env.dev
Loading

0 comments on commit c0071d0

Please sign in to comment.