1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2020-01-09 20:37:10 +01:00
4 changed files with 34 additions and 7 deletions

View File

@@ -0,0 +1 @@
<img class="smilies" src="phpBB/images/smilies/lol.png" width="17" height="17" alt="[lol]" title="lol">

View File

@@ -0,0 +1 @@
[lol]

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_smilies">
<column>smiley_id</column>
<column>code</column>
<column>emotion</column>
<column>smiley_url</column>
<column>smiley_width</column>
<column>smiley_height</column>
<column>smiley_order</column>
<column>display_on_posting</column>
<row>
<value>41</value>
<value>[lol]</value>
<value>lol</value>
<value>lol.png</value>
<value>17</value>
<value>17</value>
<value>41</value>
<value>1</value>
</row>
</table>
</dataset>