freenetis-githubsourceforge
Undo my stupid mistake (I have pushed issue-957 to master instead of develop). Do I have copied files from GitHub master and push them back..
Merge branch 'develop' into issue-957
Conflicts: application/controllers/members.php
refs #957: Separate settings group for members date of born
refs #957: "I'm older than x years" checkbox is only shown when adding/editing main user
ref #957: Birthday is not required
refs #988: Added support for onetime passwords
Merge remote-tracking branch 'GitLab/develop' into develop
refs #967: Filtering destination account
refs #864: Improved label of registration form link from applicants grid.
refs #908: Updated contact verification string
Zobrazit revize
Také k dispozici: Atom