Conflicts: css/style.css src/General/Config.coffee src/General/meta/manifest.json src/Posting/QuickReply.coffee