Skip to content
Snippets Groups Projects
Commit 4247dc7f authored by Martin Jakubašek's avatar Martin Jakubašek
Browse files

Merge branch 'master' into PPBKA3M-99 

# Conflicts:
#	WebApp/Startup.cs
#	WebApp/WebApp.csproj
parents afaf3b12 c794c8aa
Branches PPBKA3M-99
No related tags found
1 merge request!11PPBKA3M-99 - WIP: Bootstrap frontend application
Pipeline #9503 failed
Stage: build
    Stage: test
      Stage: lint
        Hide whitespace changes
        Inline Side-by-side
        Showing
        with 463 additions and 384 deletions
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment