Merge branch 'html'

2012-05-13 16:51:33 +02:00 · 2012-05-13 16:51:33 +02:00 · 1e263ba7d9
commit 1e263ba7d9
parent b35e929519 1d0f5a3d24
3 changed files with 1103 additions and 1199 deletions
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
--- a/1
+++ b/1
@ -1,5 +1,6 @@
 master
 - Mayhem
+  Add Spoiler indicator option in File Info Formatting
  Remove archive.no-ip.org archive redirections.

 2.29.5
--- a/script.coffee
+++ b/script.coffee