Skip to content
Snippets Groups Projects
Commit da3203da authored by Erik Hinkelmanns's avatar Erik Hinkelmanns
Browse files

Merge remote-tracking branch 'origin/madlen' into music_player 

# Conflicts:
#	lib/classification/classification.dart
#	lib/loginRegister/login.dart
#	macos/Flutter/GeneratedPluginRegistrant.swift
#	pubspec.lock
#	pubspec.yaml
parents e07ff29c bb5978eb
Branches
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 225 additions and 404 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment