summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorHenrik Paul <henrik@vaadin.com>2015-03-16 16:39:07 +0200
committerHenrik Paul <henrik@vaadin.com>2015-03-17 10:36:25 +0200
commit7a0be4e8e71df51f6fe49d2651f05e9430e307e1 (patch)
treef1e6883caa153757064fded0a5434ff76505fec4 /shared
parentfd700f072fb72113cd559aea60819acc85b0fda5 (diff)
parentf61cf666f3d28ac57b6c3cd5de30d9b54814d683 (diff)
parent8ece5b005a8edb5c50d06c0ac9758044f7e8b877 (diff)
downloadvaadin-framework-7a0be4e8e71df51f6fe49d2651f05e9430e307e1.tar.gz
vaadin-framework-7a0be4e8e71df51f6fe49d2651f05e9430e307e1.zip
Merge remote-tracking branches 'origin/grid-detailsrow' and 'origin/grid-columnhiding' into grid-7.5
Change-Id: Ib8913f8e1b1b92198d79f8920c615addf77a15ba