Skip to content
Commit 609487a0 authored by Vincent Latombe's avatar Vincent Latombe
Browse files

Merge branch 'master' into views_include_jobs_folder 

Conflicts:
	changelog.html
parents 0c0959ec b22b17c0
Hide whitespace changes
Inline Side-by-side
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