summaryrefslogtreecommitdiffstats
path: root/WebContent/license.html
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-06-27 15:49:26 +0300
committerVaadin Code Review <review@vaadin.com>2014-06-30 05:31:43 +0000
commit9ceac5b2a8e9541c012b90f72d5f222ec508556e (patch)
tree66a2b5e04f51e16b51d25906894a1e674c8fae8c /WebContent/license.html
parent0ba894d63b83f44aa77b925a9bda127c82237d75 (diff)
downloadvaadin-framework-9ceac5b2a8e9541c012b90f72d5f222ec508556e.tar.gz
vaadin-framework-9ceac5b2a8e9541c012b90f72d5f222ec508556e.zip
Revert to org.json as Android JSON is not 100% compatible (#13944)
Update to new GWT which also uses the correct org.json dependency Change-Id: I9414be188bf59975d01186a9daf83f0c170a88bc
Diffstat (limited to 'WebContent/license.html')
-rw-r--r--WebContent/license.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebContent/license.html b/WebContent/license.html
index d984717773..e1b0bed54a 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 -->