Merge pull request #30694 from rjfd/wip-dashboard-fix-translations

author Ricardo Dias <rdias@suse.com>

Fri, 11 Oct 2019 13:33:31 +0000 (14:33 +0100)

committer GitHub <noreply@github.com>

Fri, 11 Oct 2019 13:33:31 +0000 (14:33 +0100)
author Ricardo Dias <rdias@suse.com>
Fri, 11 Oct 2019 13:33:31 +0000 (14:33 +0100)
committer GitHub <noreply@github.com>
Fri, 11 Oct 2019 13:33:31 +0000 (14:33 +0100)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/pybind/mgr/dashboard/module.py
Simple merge
author	Ricardo Dias <rdias@suse.com>
	Fri, 11 Oct 2019 13:33:31 +0000 (14:33 +0100)
committer	GitHub <noreply@github.com>
	Fri, 11 Oct 2019 13:33:31 +0000 (14:33 +0100)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/module.py	patch \|	diff1 \|	diff2 \|	blob \| history