Merge branch 'release' into integration/master · zanata/zanata-server@2be83b0 · GitHub

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

Commit

Merge branch 'release' into integration/master

Browse files

Conflicts:
	functional-test/src/main/java/org/zanata/page/AbstractPage.java

Loading branch information

seanf committed Apr 21, 2015

2 parents 0158851 + 8b3cc44 commit 2be83b0