Merge branch 't/13246' into major

ckeditor · Jun 24, 2015 · 22ee5a3 · 22ee5a3
2 parents 0d9c43d + ecf8316
commit 22ee5a3
Show file tree

Hide file tree

Showing 20 changed files with 375 additions and 9,479 deletions.
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/samples/css/samples.css b/samples/css/samples.css
diff --git a/samples/fonts/indieflower/OFL.txt b/samples/fonts/indieflower/OFL.txt
diff --git a/samples/fonts/indieflower/indieflower.eot b/samples/fonts/indieflower/indieflower.eot
diff --git a/samples/fonts/indieflower/indieflower.svg b/samples/fonts/indieflower/indieflower.svg
diff --git a/samples/fonts/indieflower/indieflower.ttf b/samples/fonts/indieflower/indieflower.ttf
diff --git a/samples/fonts/indieflower/indieflower.woff b/samples/fonts/indieflower/indieflower.woff
diff --git a/samples/fonts/mavenpro/OFL.txt b/samples/fonts/mavenpro/OFL.txt
diff --git a/samples/fonts/mavenpro/mavenpro-bold.eot b/samples/fonts/mavenpro/mavenpro-bold.eot