Merge branch 'master' into qr

Conflicts:
	4chan_x.user.js
	script.coffee
This commit is contained in:
Nicolas Stepien 2012-01-09 02:01:51 +01:00
commit fcb7c20012
2 changed files with 2 additions and 2 deletions

View File

@ -3002,7 +3002,7 @@
.move {\ .move {\
cursor: move;\ cursor: move;\
}\ }\
label, a, .favicon {\ label, .favicon {\
cursor: pointer;\ cursor: pointer;\
}\ }\
a[href="javascript:;"] {\ a[href="javascript:;"] {\

View File

@ -2447,7 +2447,7 @@ Main =
.move { .move {
cursor: move; cursor: move;
} }
label, a, .favicon { label, .favicon {
cursor: pointer; cursor: pointer;
} }
a[href="javascript:;"] { a[href="javascript:;"] {