step0
step0 work
step0
Merge branch 'master' of https://github.com/larpomatic/gnk into larroq_v

Conflicts:
	src/groovy/org/gnk/roletoperso/Character.groovy
Merge remote-tracking branch 'origin/master' into larroq_v
push step0
Merge remote-tracking branch 'origin/master' into beling_a