summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorMarkus Koivisto <markus@vaadin.com>2014-09-10 12:09:00 +0300
committerSauli Tähkäpää <sauli@vaadin.com>2014-10-29 10:49:08 +0200
commit7fc8ce1f25db90973b12dd9569bdb42407be4a90 (patch)
treebd3426b2090848f8279a872d2e9e749f2c2802a2 /shared
parentc8f212e9a311252468c9649ca3920451e4cd1cd6 (diff)
downloadvaadin-framework-7fc8ce1f25db90973b12dd9569bdb42407be4a90.tar.gz
vaadin-framework-7fc8ce1f25db90973b12dd9569bdb42407be4a90.zip
resolve org.json version conflict between server and shared (#14618)
Change-Id: Iae1723bfcfa56084a1339247b1f82e9277555a5e
Diffstat (limited to 'shared')
0 files changed, 0 insertions, 0 deletions