]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d2a007 2ff71f6)
Merge branch '7.1' into tb3
authorLeif Åstrand <leif@vaadin.com>
Tue, 6 Aug 2013 07:23:16 +0000 (10:23 +0300)
committerLeif Åstrand <leif@vaadin.com>
Tue, 6 Aug 2013 07:23:16 +0000 (10:23 +0300)
1  2 
server/ivy.xml patch | diff1 | diff2 | blob | history

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