Merge changes I2f1b08c0,Ie38a6b51
authorFelix Dörre <felix@dogcraft.de>
Mon, 18 Dec 2017 23:42:25 +0000 (00:42 +0100)
committerGerrit Code Review <gigi-system@dogcraft.de>
Mon, 18 Dec 2017 23:42:25 +0000 (00:42 +0100)
* changes:
  chg: move email and domain to verification menu
  chg: adjust wording to have a consequent wording over all pages displayed to the user


Trivial merge