# Conflicts:
#	modules/bindata/bindata.go

Update TRANSLATORS

Fix race condition on ssh key delete, and revert re-revert of hard line break

Fix Fail to load gopmfile: could not parse line: github.com/mcuadros/go-version

43bfee0d48 reverted my change

Updated Translators

423b1c69be7828c331a47467b66217d190e916b9, which in turn
causes all content to be served as text/plain. Let go decide
what the mime type is (e.g. text/html instead of text/plain).

423b1c69be7828c331a47467b66217d190e916b9, which in turn
causes all content to be served as text/plain. Let go decide
what the mime type is (e.g. text/html instead of text/plain).

Correct form name to smtp_email to fix matching in InstallForm struct.

fixed chinese character to japanese KANJI

Conflicts:
	routers/repo/download.go

column belongs always into a ui grid