Commit f3ce79c8 authored by Benjamin REIS's avatar Benjamin REIS

Merge remote-tracking branch 'origin/master' into dev_conference_info

parents 6a90b637 c94f5a11
Markdown is supported
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