Merge remote-tracking branch 'upstream/dev' into wiki

2016-06-05 16:52:02 -04:00
parent 0a3fbdd128 dd6718c2cd
commit 08a9553ccc
7 changed files with 27 additions and 21 deletions
@@ -312,3 +312,8 @@ code.inline-code {
 .overline {
 	text-decoration: overline;
 }
+
+img.smiley.emoji:hover {
+	width: 32px;
+	height: 32px;
+}