|
Marc
|
b2e2d81d2d9be67230d26797f751726efc1f8bc1
b2e2d81d2d9be67230d26797f751726efc1f8bc1 |
Merge pull request #6290 from 3D-I/ticket/16850
[ticket/16850][4.0] Update webfont loader |
|
|
Marc
|
9b0770f09f20585179a22342ef351b20fe16f9c3
9b0770f09f20585179a22342ef351b20fe16f9c3 |
Merge branch '3.3.x' |
|
|
Marc
|
848021c7435072444b11c263ec5420060582141b
m 848021c7435072444b11c263ec5420060582141b |
Merge pull request #6291 from 3D-I/ticket/16850-33
[ticket/16850][3.3] Update webfont loader |
|
|
Marc
|
c4b4e1d7a9db61db09c59e7566c5872788555921
m c4b4e1d7a9db61db09c59e7566c5872788555921 |
Merge branch 'prep-release-3.3.5' into 3.3.x |
|
|
Marc
|
ed33f06235ab1324193f3139acf21feb70dadd4b
m ed33f06235ab1324193f3139acf21feb70dadd4b |
Merge branch 'ticket/16850' into prep-release-3.3.5 |
|