Merge branch 'show-reference-lang' of https://github.com/HannesEskeba… · zanata/zanata-server@2612a8f · GitHub

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

Commit

Merge branch 'show-reference-lang' of https://github.com/HannesEskeba…

Browse files

…ek/zanata-server into show-reference-lang

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/LocaleListBox.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/ChangeReferenceLangView.java

Loading branch information

HannesEskebaek committed Nov 4, 2013

2 parents d91be2e + 2239a52 commit 2612a8f