diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-04-16 14:19:11 +0300 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-04-16 14:19:11 +0300 |
| commit | 202514e6c03877b40bbb17fbb74cf4d68eb21503 (patch) | |
| tree | 2528d17a52bb82805decdcd66ec6a0889812f508 /ivysettings.xml | |
| parent | 6c022639adfcf2c0b8db52062b32a0479b07ad7d (diff) | |
| parent | 591996b94e7b7c432708611819087b8e03d21ea5 (diff) | |
| download | vaadin-framework-202514e6c03877b40bbb17fbb74cf4d68eb21503.tar.gz vaadin-framework-202514e6c03877b40bbb17fbb74cf4d68eb21503.zip | |
Merge commit '591996b' into 7.2
Conflicts:
build.properties
Change-Id: Ie3cf9bd0af8aba7debf4626d2db77afea37e7cb3
Diffstat (limited to 'ivysettings.xml')
0 files changed, 0 insertions, 0 deletions