Commit 78d422a4 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.1-per-action-restart' into per-action-restart 

Conflicts:
	src/core/Action.cpp
	src/core/ActionSetup.cpp
parents 5ea13df1 af3ccd2b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment