Commit 79d0a4ef authored by Guy Thouret's avatar Guy Thouret
Browse files

Merge branch 'master' into chore/616-propogate-props 

# Conflicts:
#	Controllers/api/v1/newsfeed.php
#	Core/Permissions/Manager.php
#	Core/Storage/Services/S3.php
#	Spec/Core/Permissions/Entities/ManagerSpec.php
parents b77a10ba 91c223dc
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