]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #28178 from tspmelo/wip-39658-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Fri, 7 Jun 2019 00:02:20 +0000 (17:02 -0700)
committerGitHub <noreply@github.com>
Fri, 7 Jun 2019 00:02:20 +0000 (17:02 -0700)
commit2dec77683a8bf6ba520b4ab2e2d36e5fdabedc1e
tree258beced396a3c4ce8a6ac78ad22fe5b257daa14
parent478f1035e0e0cf998156099a4273206c964301ba
parent95d2af810ced643cd11247865747e60a392d4815
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>
src/pybind/mgr/dashboard/HACKING.rst