Merge remote-tracking branch 'origin/rhbz1066756' into rhbz1066756 · zanata/zanata-server@b928416 · GitHub

This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Merge remote-tracking branch 'origin/rhbz1066756' into rhbz1066756

Browse files

Conflicts:
	zanata-war/src/main/resources/messages.properties

Loading branch information

Carlos A. Munoz committed Apr 13, 2014

2 parents 7e74ba0 + 5a05dfa commit b928416