Skip to content
GitLab
Commit def7b8ad authored by Domingo Manubens-Gil's avatar Domingo Manubens-Gil
Browse files

Merge branch 'develop-2.4_recovery' into develop-2.4.0 

Conflicts:
	src/change_pkl.py
	src/job/job_list.py
parents d832eeb2 d40b9359
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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