Merge remote-tracking branch 'archives/master' into 1.9.11.x
Conflicts: src/Archive/archives.json
This commit is contained in:
commit
2f1a94e802
@ -60,6 +60,6 @@
|
||||
"https": false,
|
||||
"software": "foolfuuka",
|
||||
"boards": ["an", "fit", "gif", "int", "jp", "mlp", "out", "r9k", "sp", "toy"],
|
||||
"files": ["an", "gif", "int", "jp", "mlp", "out", "r9k", "sp", "toy"],
|
||||
"files": ["an", "gif", "fit", "int", "jp", "mlp", "out", "r9k", "sp", "toy"],
|
||||
"imagehosts": ["http://imcute.yt/"]
|
||||
}]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user