]> source.dussan.org Git - vaadin-framework.git/commit
Merge changes from origin/7.2
authorArtur Signell <artur@vaadin.com>
Fri, 2 May 2014 08:06:12 +0000 (11:06 +0300)
committerArtur Signell <artur@vaadin.com>
Fri, 2 May 2014 08:06:33 +0000 (11:06 +0300)
commit9c1501a5d341082f61398b8e1e6bde4aa7826d7a
tree95538349d8a13d4792857bc693e7ae288468d94a
parente96bd18de7234e3c84bb4f693d2dfb4d19265267
parent08b0589d05e69da58b58c42b96a69c9331fdce25
Merge changes from origin/7.2

08b0589 Refactored TimeoutRedirectResetsOnActivity tests.

Conflicts:
uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java

Change-Id: Id2dc47cb5396a24c97a2689c1412b29a421ac400
uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java