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

Merge remote-tracking branch 'remotes/origin/dev' into Issue/2373-fixPagination 

# Conflicts:
#	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
parents 44d57394 f8c89623
No related branches found
No related tags found
1 merge request!56Update: Search page pagination and filtering
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment