diff options
author | John Ahlroos <john@vaadin.com> | 2014-08-07 16:32:23 +0300 |
---|---|---|
committer | John Ahlroos <john@vaadin.com> | 2014-08-07 16:35:06 +0300 |
commit | ecff9648d1cb3d5cc4bd54d2b1e1c6357429792f (patch) | |
tree | b21f4b599183c157900b0f24d41c94e6af3b08a7 /WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf | |
parent | e5230e6a2433f5c8a74c66b73e96d0454866d316 (diff) | |
parent | ff47bdd97b03a42dfc812b4dc9ad71fa45ce3827 (diff) | |
download | vaadin-framework-ecff9648d1cb3d5cc4bd54d2b1e1c6357429792f.tar.gz vaadin-framework-ecff9648d1cb3d5cc4bd54d2b1e1c6357429792f.zip |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
WebContent/release-notes.html
Change-Id: Ie05bea7142134a7a9d655fcdf6ca232fd13c742b
Diffstat (limited to 'WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf')
-rwxr-xr-x[-rw-r--r--] | WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf | bin | 40252 -> 40252 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf Binary files differindex d2d6318f66..d2d6318f66 100644..100755 --- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf +++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf |