Merge branch 'codirt-master'

This commit is contained in:
Arvid Andersson
2015-11-18 16:54:58 +01:00
+2 -2
View File
@@ -151,8 +151,8 @@
<li><div><img src="graphics/emojis/pensive.png"> :<span class="name">pensive</span>:</div></li>
<li><div><img src="graphics/emojis/disappointed.png"> :<span class="name" data-alternative-name="sad, lonely">disappointed</span>:</div></li>
<li><div><img src="graphics/emojis/confounded.png"> :<span class="name">confounded</span>:</div></li>
<li><div><img src="graphics/emojis/fearful.png"> :<span class="name" data-alternative-name="scared, afraid">fearful</span>:</div></li>
<li><div><img src="graphics/emojis/cold_sweat.png"> :<span class="name"data-alternative-name= "scared, frightened">cold_sweat</span>:</div></li>
<li><div><img src="graphics/emojis/fearful.png"> :<span class="name" data-alternative-name="scared, afraid, nervous, scared">fearful</span>:</div></li>
<li><div><img src="graphics/emojis/cold_sweat.png"> :<span class="name"data-alternative-name= "scared, frightened, nervous, scared">cold_sweat</span>:</div></li>
<li><div><img src="graphics/emojis/persevere.png"> :<span class="name">persevere</span>:</div></li>
<li><div><img src="graphics/emojis/cry.png"> :<span class="name" data-alternative-name="sad, unhappy, tear">cry</span>:</div></li>
<li><div><img src="graphics/emojis/sob.png"> :<span class="name" data-alternative-name="sad, unhappy">sob</span>:</div></li>