]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 202514e 5057c59)
Merge changes from origin/7.1
authorBuild Agent <build@vaadin.com>
Wed, 16 Apr 2014 12:09:25 +0000 (15:09 +0300)
committerBuild Agent <build@vaadin.com>
Wed, 16 Apr 2014 12:09:26 +0000 (15:09 +0300)
08b0589 Refactored TimeoutRedirectResetsOnActivity tests.
5057c59 Added integration test for WebSphere Portal. (#13309)

Change-Id: I50c8a8f6513679dca611889b43782d6ee6089d6c

1  2 
uitest/ivy.xml patch | diff1 | diff2 | blob | history

diff --cc uitest/ivy.xml
Simple merge
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework