tree 388ed2098e5fac73acdab4d9d4c01f9af8902688
parent 349bf3d87711d9f99eeb7db24f329610d17d372b
parent 1f0430b41416080d1027da5be7bef593e36b2f90
author David Ostrovsky <david@ostrovsky.org> 1528237732 +0200
committer David Ostrovsky <david@ostrovsky.org> 1528237732 +0200

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  FieldType: Remove unnecessary KEYWORD type

Change-Id: I7e099a909e834eb96fdcce7894ad43a6d78959dd