Skip to content
Snippets Groups Projects
Commit c89b0fc1 authored by cpilaszewicz's avatar cpilaszewicz
Browse files

Merge branch 'dev' into 263-restructure-authentication-2 

# By Jacob Freise (1) and wieseoli (1)
# Via hanneh00 (2) and wieseoli (1)
* dev:
  work on swiftUI for Inbox Add Strokes and other helpfunctions
  resolve MR comments

# Conflicts:
#	enzevalos_iphone/AuthenticationScreen.swift
#	enzevalos_iphone/AuthenticationViewModel.swift
parents 853f9d26 bef94468
Branches
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 690 additions and 52 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment