Conflicts: CHANGELOG.md package.json src/Images/ImageExpand.coffee src/Images/ImageHover.coffee src/Miscellaneous/FileInfo.coffee src/Posting/QR.coffee
Conflicts: CHANGELOG.md package.json src/Images/ImageExpand.coffee src/Images/ImageHover.coffee src/Miscellaneous/FileInfo.coffee src/Posting/QR.coffee