Merge branch '3.2.x'

Browse Source

...

This commit is contained in:

Marc Alexander

2017-04-17 12:02:22 +02:00

parent 4206e25b2a 2c66867126

commit a87727ba47

7 changed files with 2670 additions and 639 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4

phpBB/assets/css/font-awesome.min.css vendored

File diff suppressed because one or more lines are too long

BIN

phpBB/assets/fonts/FontAwesome.otf

Binary file not shown.

BIN

phpBB/assets/fonts/fontawesome-webfont.eot

Binary file not shown.

3305

phpBB/assets/fonts/fontawesome-webfont.svg

File diff suppressed because it is too large Load Diff

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 348 KiB After Width:  |  Height:  |  Size: 434 KiB

BIN

phpBB/assets/fonts/fontawesome-webfont.ttf

Binary file not shown.

BIN

phpBB/assets/fonts/fontawesome-webfont.woff

Binary file not shown.

BIN

phpBB/assets/fonts/fontawesome-webfont.woff2

Binary file not shown.