diff options
| author | Henri Sara <hesara@vaadin.com> | 2014-06-30 12:50:24 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2014-06-30 12:50:24 +0300 |
| commit | 00594db377d6c6935d445d42fef691b97e5c84f3 (patch) | |
| tree | 1a26af0819f39d26956eecec4e37dc5d6ad7f053 /WebContent/license.html | |
| parent | 565f752c9d6fbda5cd0aa1f2b2da83bc405d83f7 (diff) | |
| parent | 9ceac5b2a8e9541c012b90f72d5f222ec508556e (diff) | |
| download | vaadin-framework-00594db377d6c6935d445d42fef691b97e5c84f3.tar.gz vaadin-framework-00594db377d6c6935d445d42fef691b97e5c84f3.zip | |
Merge branch 'master' into valo
Change-Id: Ifeb36e6c0acd156b7714f96f32ad7d4ff8416100
Diffstat (limited to 'WebContent/license.html')
| -rw-r--r-- | WebContent/license.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebContent/license.html b/WebContent/license.html index d0bcbdd94d..f714e4d64d 100644 --- a/WebContent/license.html +++ b/WebContent/license.html @@ -99,7 +99,7 @@ <!-- In vaadin-shared-deps --> <tr> <td>JSON</td> - <td><a href="licenses/apache-license-version-2-0.txt">Apache License, Version 2.0</a></td> + <td><a href="licenses/the-json-license.txt">The JSON License</a></td> </tr> <!-- Used by vaadin-server --> |