Skip to content

Integrate latest updates from upstream pull requests #40, #41

James Addison requested to merge staging/integrate-upstream-fixes into master

Integrates the latest updates and resolve merge conflicts from upstream pull requests mattermost/mattermost-plugin-walltime#40 and mattermost/mattermost-plugin-walltime#41

This allows us to remove the workaround added in !4 (merged).

Edited by James Addison

Merge request reports