freenetis-githubsourceforge
Fix merge issue that removed all staff from developer branch :-).
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
ref #957: Birthday is not required
refs #988: Added support for onetime passwords
refs #967: Filtering destination account
Merge from SVN branch 1.2.
Release 1.1.12
Release 1.1.6
Release 1.1.2
Zobrazit revize
Také k dispozici: Atom