Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/1.0.4' # Conflicts: # src/main/resources/META-INF/plugin.xml
- Loading branch information
Merge branch 'release/1.0.4' # Conflicts: # src/main/resources/META-INF/plugin.xml