Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/resources/YoshikoStrings.properties

Merge remote-tracking branch 'origin/master'
c99d46ed · Philipp Spohr · e17a86c6 · f779c437 · c99d46ed
Commit c99d46ed authored 7 years ago by Philipp Spohr
--- a/src/main/resources/YoshikoStrings.properties
+++ b/src/main/resources/YoshikoStrings.properties
@@ -116,4 +116,4 @@ warning = Warning
 wrapperVersion = Yoshiko Plugin for Cytoscape Version
 yoshTask = Performing Yoshiko Algorithm
 yoshVersion = Yoshiko Version
-yoshikoHint = Yoshiko Hint
\ No newline at end of file
+yoshikoHint = Yoshiko Hint