1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 17:27:16 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2017-09-06 19:07:35 +02:00
4 changed files with 38 additions and 0 deletions

View File

@@ -0,0 +1 @@
<img class="smilies" src="phpBB/images/smilies/icon_e_surprised.gif" width="15" height="17" alt=":o" title="First half of :ok:"> <img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt="k:" title="Second half of :ok:"> <img alt=":ok:" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/emojione/assets/svg/1f197.svg">

View File

@@ -0,0 +1 @@
:o k: :ok:

View File

@@ -0,0 +1,33 @@
<?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>13</value>
<value>:o</value>
<value>First half of :ok:</value>
<value>icon_e_surprised.gif</value>
<value>15</value>
<value>17</value>
<value>14</value>
<value>1</value>
</row>
<row>
<value>99</value>
<value>k:</value>
<value>Second half of :ok:</value>
<value>icon_lol.gif</value>
<value>15</value>
<value>17</value>
<value>22</value>
<value>1</value>
</row>
</table>
</dataset>