Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up changelog.

Browse Source
This commit is contained in:
ahodesuka 2012-02-20 20:14:59 -06:00
parent 521483eeb3
commit e47a3ccf58
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

@ -1,8 +1,6 @@
master master
<<<<<<< HEAD
- ahodesuka - ahodesuka
Add auto noko option for replies from the main board and not dumping. Add auto noko option for replies from the main board and not dumping.
=======
- Mayhem - Mayhem
The Filter now has per filter settings: The Filter now has per filter settings:
- Filter the OP along its thread, replies only, or both. - Filter the OP along its thread, replies only, or both.
@ -11,7 +9,6 @@ master
New filter group: Image dimensions. New filter group: Image dimensions.
Fix posting on Safari. Fix posting on Safari.
Fix rare case where the QR would not accept certain image types. Fix rare case where the QR would not accept certain image types.
>>>>>>> 15b7a55fe01b90965f3663202b71d799456ff95e
2.26.4 2.26.4
- Mayhem - Mayhem