Merge remote-tracking branch 'origin/master'

Author: rolandgeider

pubspec.lock

@@ -545,14 +545,14 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.6.0"
+    version: "4.7.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.3.2"
+    version: "6.4.0"
   klizma:
     dependency: transitive
     description:

pubspec.yaml

@@ -44,7 +44,7 @@ dependencies:
   http: ^0.13.5
   image_picker: ^0.8.4+9
   intl: ^0.17.0
-  json_annotation: ^4.5.0
+  json_annotation: ^4.7.0
   version: ^3.0.2
   package_info: ^2.0.2
   provider: ^6.0.3