]> source.dussan.org Git - vaadin-framework.git/commit
Merge commit '691580e36b1b5a04e1f18004783b28ca9892fa31' into master
authorJonatan Kronqvist <jonatan@vaadin.com>
Mon, 10 Feb 2014 09:46:33 +0000 (11:46 +0200)
committerJonatan Kronqvist <jonatan@vaadin.com>
Mon, 10 Feb 2014 09:46:33 +0000 (11:46 +0200)
commit8748aeed2ac3a7614e2775fe14348bd866a5538d
tree0310b434f7c3cfb1ddc0abd0049f44785f5c002a
parent5284b8b28424c18dd8eb869ca97a6e8457d999b6
parent691580e36b1b5a04e1f18004783b28ca9892fa31
Merge commit '691580e36b1b5a04e1f18004783b28ca9892fa31' into master

691580e Update TestBench dependency to 3.1.2

Conflicts:
uitest/ivy.xml

Change-Id: Ic2a767595791f0730a209d833f6b9d0fcaaa4efe
uitest/ivy.xml