Fxing conflicts

This commit is contained in:
jasper 2019-02-08 13:13:11 -08:00
commit 92874b6902
24 changed files with 1103 additions and 14 deletions

View file

@ -13,6 +13,7 @@
"collapseMessageWithSubject": false,
"scopeCopy": true,
"subjectLineBehavior": "email",
"postContentType": "text/plain",
"alwaysShowSubjectInput": true,
"hidePostStats": false,
"hideUserStats": false,

File diff suppressed because one or more lines are too long