From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 7 Jun 2019 00:02:20 +0000 (-0700)
Subject: Merge pull request #28178 from tspmelo/wip-39658-nautilus
X-Git-Tag: v14.2.2~101
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2dec77683a8bf6ba520b4ab2e2d36e5fdabedc1e;p=ceph.git

Merge pull request #28178 from tspmelo/wip-39658-nautilus

nautilus: mgr/dashboard: Avoid merge conflicts in messages.xlf by auto-generating it at build time?

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
---

2dec77683a8bf6ba520b4ab2e2d36e5fdabedc1e