Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

Ambient
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

46efef6b

Commit 46efef6b authored 2 years ago by Erik Hinkelmanns

Downloads
- Plain Diff

Merge branch 'madlen' into mergeHELL

# Conflicts:
#	.gitignore
#	lib/main.dart
#	macos/Flutter/GeneratedPluginRegistrant.swift
#	pubspec.lock
#	pubspec.yaml

parents aba98321 b878a1e5

Branches

No related tags found

No related merge requests found

Changes 14

Show whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 0 deletions

.gitignore
android/app/build.gradle 6 additions, 1 deletion

android/app/build.gradle
android/app/google-services.json 39 additions, 0 deletions

android/app/google-services.json
android/build.gradle 1 addition, 0 deletions

android/build.gradle
lib/CustomSearchDelegate.dart 199 additions, 0 deletions

lib/CustomSearchDelegate.dart
lib/ambientL.jpeg 0 additions, 0 deletions

lib/ambientL.jpeg
lib/ambientR.jpeg 0 additions, 0 deletions

lib/ambientR.jpeg
lib/classification.dart 336 additions, 0 deletions

lib/classification.dart
lib/login.dart 120 additions, 0 deletions

lib/login.dart
lib/main.dart 9 additions, 2 deletions

lib/main.dart
lib/registration.dart 149 additions, 0 deletions

lib/registration.dart
lib/widgets.dart 80 additions, 0 deletions

lib/widgets.dart
macos/Flutter/GeneratedPluginRegistrant.swift 6 additions, 0 deletions

macos/Flutter/GeneratedPluginRegistrant.swift
pubspec.yaml 8 additions, 0 deletions

pubspec.yaml

with 956 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment