]> source.dussan.org Git - vaadin-framework.git/commit
No-op merge of branch 'master' into grid
authorLeif Åstrand <leif@vaadin.com>
Wed, 19 Mar 2014 07:43:41 +0000 (09:43 +0200)
committerLeif Åstrand <leif@vaadin.com>
Wed, 19 Mar 2014 07:45:19 +0000 (09:45 +0200)
commit5df1bba17d6774f3cf7a89ffce004d648c01fe19
tree5f5c3f6c03326afe580f26eb395963f5c1e50804
parentcca2172654699f9e2f79e8b36c70700c248da8f2
parente91edf12e9d290f36e5a5936ef839be62e9642b6
No-op merge of branch 'master' into grid

This ignores the contents of the accidental merge of grid into master
and the subsequent revert while still marking those commits as included
in grid so that future merges do not try to pull in those changes.

Change-Id: If283825fc3777492f3ce993789daf302b9302e2a