[wesnoth-commits] [wesnoth/wesnoth] 296894: Change the plural race name for merfolk to Merfolk

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 296894c5155ca6c2e77bfa92dee65a98e6797318
      https://github.com/wesnoth/wesnoth/commit/296894c5155ca6c2e77bfa92dee65a98e6797318
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2018-04-22 (Sun, 22 Apr 2018)

  Changed paths:
    M changelog.md
    M data/core/units.cfg

  Log Message:
  -----------
  Change the plural race name for merfolk to Merfolk

See issue #2940.

[ci skip]