Nathan Friend 84e550fad9 Fix frontend tests related to autoMergeStrategy ... A few minor frontend changes to complete the refactoring from MWPS to the more generic autoMergeStrategy.		2019-06-03 13:15:31 +07:00
..
components	…
stores	Fix frontend tests related to autoMergeStrategy	2019-06-03 13:15:31 +07:00