Merge remote-tracking branch 'origin/feature/200' into feature/200

erickok · erickok · commit 2f36f5c8d84e · 2021-04-28T18:21:56.000+02:00
# Conflicts:
#	pubspec.yaml
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -45,4 +45,3 @@ dev_dependencies:
     sdk: flutter
 
 flutter:
-
