Merge branch 'master' into v3

This commit is contained in:
Nicolas Stepien 2013-04-06 05:07:18 +02:00
commit 13012e1175
2 changed files with 4 additions and 2 deletions

View File

@ -1,4 +1,6 @@
master
- Mayhem
Add /fa/ and /s4s/ archive redirection.
2.39.2
- Mayhem

View File

@ -1979,7 +1979,7 @@ Redirect =
"//nsfw.foolz.us/#{boardID}/full_image/#{filename}"
when 'po'
"//archive.thedarkcave.org/#{boardID}/full_image/#{filename}"
when 'ck', 'lit'
when 'ck', 'fa', 'lit', 's4s'
"//fuuka.warosu.org/#{boardID}/full_image/#{filename}"
when 'cgl', 'g', 'mu', 'w'
"//rbt.asia/#{boardID}/full_image/#{filename}"
@ -2006,7 +2006,7 @@ Redirect =
Redirect.path '//nsfw.foolz.us', 'foolfuuka', data
when 'int', 'out', 'po'
Redirect.path '//archive.thedarkcave.org', 'foolfuuka', data
when 'ck', 'lit'
when 'ck', 'fa', 'lit', 's4s'
Redirect.path '//fuuka.warosu.org', 'fuuka', data
when 'diy', 'sci'
Redirect.path '//archive.installgentoo.net', 'fuuka', data