aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/merge.sh
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-07-24 13:45:41 +0300
committerLeif Åstrand <leif@vaadin.com>2012-07-24 13:45:41 +0300
commit410653ce8608da1be105fc3e814799f6fe1c2163 (patch)
tree9b198ad8ec71049497c4529bab34f39909ecadca /scripts/merge.sh
parentd0cf1686b2e0bba5748dec066ebd0b5d1148cc72 (diff)
downloadvaadin-framework-410653ce8608da1be105fc3e814799f6fe1c2163.tar.gz
vaadin-framework-410653ce8608da1be105fc3e814799f6fe1c2163.zip
Revert "Change testing portlet parameter to use root instead of application"
This reverts commit e566200882075e7b51d0fb0ab067cb5d14ac785a.
Diffstat (limited to 'scripts/merge.sh')
0 files changed, 0 insertions, 0 deletions