diff options
| author | Artur Signell <artur@vaadin.com> | 2014-04-11 08:40:15 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2014-04-11 08:40:15 +0300 |
| commit | 34029194d6a20b00ed7a778267ba69121d1ccb0e (patch) | |
| tree | 530a2d8552ea7d229e5a1c5b706f5f2e9c79a285 /scripts | |
| parent | aec102a5906dbaae53443c4ac03636ebe0fcc9ea (diff) | |
| download | vaadin-framework-34029194d6a20b00ed7a778267ba69121d1ccb0e.tar.gz vaadin-framework-34029194d6a20b00ed7a778267ba69121d1ccb0e.zip | |
Merge from 7.2
Change-Id: Ic52a0be061bf22058ac9b831f3e965547a1b8933
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/automerge7.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh index 079dec7eea..abc577f6b9 100755 --- a/scripts/automerge7.sh +++ b/scripts/automerge7.sh @@ -1,7 +1,7 @@ #!/bin/bash IGNORE=7.0 -FROM=7.1 +FROM=7.2 TO=master IGNORE_HEAD=origin/$IGNORE |