Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

This commit is contained in:
Zixaphir 2014-03-03 00:07:46 -07:00
commit 0a00d95d0a
2 changed files with 2 additions and 4 deletions

View File

@ -1,7 +1,5 @@
## Reporting bugs and suggestions ## Reporting bugs and suggestions
Reporting bugs:
1. Make sure both your **browser** and **4chan X** are up to date.<br> 1. Make sure both your **browser** and **4chan X** are up to date.<br>
Only **Chrome**, **Firefox** and **Opera** are supported.<br> Only **Chrome**, **Firefox** and **Opera** are supported.<br>
**SRWare Iron**, **Firefox ESR**, **Pale Moon**, **Waterfox**, and other derivatives are not supported; use them at your own risk. **SRWare Iron**, **Firefox ESR**, **Pale Moon**, **Waterfox**, and other derivatives are not supported; use them at your own risk.

View File

@ -86,8 +86,8 @@
"http": true, "http": true,
"https": true, "https": true,
"software": "foolfuuka", "software": "foolfuuka",
"boards": ["r", "soc"], "boards": ["cm", "hm", "r", "soc", "y"],
"files": ["r", "soc"] "files": ["cm", "hm", "r", "soc", "y"]
}, { }, {
"uid": 16, "uid": 16,
"name": "maware", "name": "maware",