Skip to content
Snippets Groups Projects
Commit f6423870 authored by Madlen Ort's avatar Madlen Ort
Browse files

Merge branch 'madlen' into WirMachenFirebaseMitRein

# Conflicts:
#	lib/classification/classification.dart
#	lib/loginRegister/login.dart
#	macos/Flutter/GeneratedPluginRegistrant.swift
#	pubspec.lock
#	pubspec.yaml
parents 716ce677 bb5978eb
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment