Merge from 7.2 · 34029194d6 - vaadin-framework - source @ dussan.org

Merge from 7.2

Change-Id: Ic52a0be061bf22058ac9b831f3e965547a1b8933

tags/7.2.0.beta1

Artur Signell 10 years ago

parent

aec102a590

commit

34029194d6

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
scripts/automerge7.shView File
								
			@@ -1,7 +1,7 @@
		
			#!/bin/bash
		
			IGNORE=7.0
		
			FROM=7.1
		
			FROM=7.2
		
			TO=master
		
			IGNORE_HEAD=origin/$IGNORE