diff options
| author | Artur Signell <artur@vaadin.com> | 2014-05-02 11:06:12 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2014-05-02 11:06:33 +0300 |
| commit | 9c1501a5d341082f61398b8e1e6bde4aa7826d7a (patch) | |
| tree | 95538349d8a13d4792857bc693e7ae288468d94a /client/src | |
| parent | e96bd18de7234e3c84bb4f693d2dfb4d19265267 (diff) | |
| parent | 08b0589d05e69da58b58c42b96a69c9331fdce25 (diff) | |
| download | vaadin-framework-9c1501a5d341082f61398b8e1e6bde4aa7826d7a.tar.gz vaadin-framework-9c1501a5d341082f61398b8e1e6bde4aa7826d7a.zip | |
Merge changes from origin/7.2
08b0589 Refactored TimeoutRedirectResetsOnActivity tests.
Conflicts:
uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
Change-Id: Id2dc47cb5396a24c97a2689c1412b29a421ac400
Diffstat (limited to 'client/src')
0 files changed, 0 insertions, 0 deletions