Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
www/wot.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
|
|
dob match to account in not ttpadmin
|
|
|
|
|
|
|
|
|
|
Conflicts:
pages/wot/6.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
Conflicts:
www/styles/default.css
|
|
|
|
Conflicts:
pages/account/43.php
www/wot.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
includes/notary.inc.php
pages/account/43.php
pages/wot/6.php
www/wot.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
www/wot.php
|
|
Conflicts:
includes/notary.inc.php
includes/wot.inc.php
www/wot.php
|
|
|
|
Conflicts:
pages/wot/6.php
www/wot.php
|
|
|
|
|
|
|
|
Conflicts:
pages/wot/6.php
|
|
|
|
|
|
|
|
to be an inconsistance of the data between the file from GitHub/release the basis of this bug and the stable system.
|
|
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
|
|
|
|
|
|
|
|
ssh://dirk@git-cacert.it-sls.de/var/cache/git/cacert-devel into bug-1023
|