# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1542185533 -3600
# Node ID b82dc95dff0352faddaca16a00f31f32b6ea4d84
# Parent  a12caaa4299d6031e7d77845659b74b0003f9aa9# Parent  549c215da6cea49a65d8486e6e9905142ca6d3ae
Merge branch dev-dc (contact card evolution)