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 origin/issue-957
Merge branch 'develop' into issue-957
Conflicts: application/controllers/members.php
refs #957: Rollback changes in showing date
refs #957: "I'm older than x years" checkbox is only shown on self-register page
refs #957: Application of increase_decrease_buttons for settings fields in users tab
refs #957: Separate settings group for members date of born
refs #957: minimal main user age validator fix (valid::numeric accepts decimal numbers)
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
refs #935: Set minimum limit for post_max_size and upload_max_filesize to 1M.
refs #1014: Fixes connecting place changing when changing added by user
Merge remote-tracking branch 'GitLab/develop' into develop
refs #967: Filtering destination account
Adds gitignore.
refs #864: Fixes C&P Jeff error :-) and improves label of registration form link from applicants member and hide link when self-registration is disabled.
refs #864: Improved label of registration form link from applicants grid.
refs #908: Fixed brutal error (creating controller in controller)
refs #908: Updated contact verification string
refs #864: Register applicant button on show all applicants page
refs #864: Changed text label for registering applicants by administrator
Merge from SVN branch 1.2.
Merge from SVN trunk.
Release 1.1.12
Release 1.1.11
Release 1.1.10
Release 1.1.9
Release 1.1.8
Release 1.1.7
Release 1.1.6
Release 1.1.4
Release 1.1.3
Release 1.1.2
Release 1.1.1
Release 1.1.0
Release 1.0.12
Release 1.0.0
Deleted README.
Merge branch 'master'.
first commit