Skip to content
Snippets Groups Projects
Commit 96ff35a6 authored by Roman Sliva's avatar Roman Sliva
Browse files

Merge branch 'master' into 'pbs_eradication' 

# Conflicts:
#   docs.it4i/general/resource_allocation_and_job_execution.md
#   mkdocs.yml
parents 19457177 7969e0cc
No related branches found
No related tags found
1 merge request!440PBS eradication
Pipeline #34284 passed with warnings
Stage: test
Stage: build
Stage: deploy
Stage: after_test
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment