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

@ -84,6 +84,7 @@ const afterStoreSetup = ({ store, i18n }) => {
copyInstanceOption('loginMethod')
copyInstanceOption('scopeCopy')
copyInstanceOption('subjectLineBehavior')
copyInstanceOption('postContentType')
copyInstanceOption('alwaysShowSubjectInput')
copyInstanceOption('noAttachmentLinks')
copyInstanceOption('showFeaturesPanel')