Skip to content
Snippets Groups Projects
Commit fc7a08ef authored by Petar Hristov's avatar Petar Hristov :speech_balloon:
Browse files

Merge remote-tracking branch 'remotes/origin/dev' into uiv2 

# Conflicts:
#	src/Coscine.Api.Project/api.ts
#	src/Coscine.Api.Project/base.ts
#	src/Coscine.Api.Project/common.ts
#	src/Coscine.Api.Project/configuration.ts
#	src/Coscine.Api.Project/index.ts
#	src/Coscine.Api.Resources/api.ts
#	src/Coscine.Api.Resources/base.ts
#	src/Coscine.Api.Resources/common.ts
#	src/Coscine.Api.Resources/configuration.ts
#	src/Coscine.Api.Resources/index.ts
#	yarn.lock-workspace
parents f6f5d1f6 2e5717c9
Branches
Tags
2 merge requests!24Uiv2,!22Chore: 1.4.0
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 725 additions and 593 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment