Commit e491df61 authored by Guy Thouret's avatar Guy Thouret
Browse files

Merge branch 'master' into feat/588-state-on-user 

# Conflicts:
#	Entities/User.php
#	composer.json
#	composer.lock
parents af3c0bce 14f32dc5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment