diff options
| author | Henrik Paul <henrik@vaadin.com> | 2013-10-18 15:06:03 +0300 |
|---|---|---|
| committer | Henrik Paul <henrik@vaadin.com> | 2013-10-18 15:06:03 +0300 |
| commit | df3d643b3aaa3112d59e2ae0fb3649dd37e927a7 (patch) | |
| tree | 481b2eb92e88dcb977a68b3f4d74d8caa5ed828a /ivysettings.xml | |
| parent | 85251833de3bd101d388b20fdb9b02c532a9f1c9 (diff) | |
| parent | ebdc3652764e8ec2ce292879d459a8d0c6c2d2e3 (diff) | |
| download | vaadin-framework-df3d643b3aaa3112d59e2ae0fb3649dd37e927a7.tar.gz vaadin-framework-df3d643b3aaa3112d59e2ae0fb3649dd37e927a7.zip | |
Merge commit 'ebdc3652764e8ec2ce292879d459a8d0c6c2d2e3'
Conflicts:
server/src/com/vaadin/server/VaadinSession.java
Change-Id: I51383060a95354b7ffbcc5b12683c1d1a817b8bf
Diffstat (limited to 'ivysettings.xml')
0 files changed, 0 insertions, 0 deletions