Age | Commit message (Collapse) | Author |
|
|
|
conflicts when integrating both together
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
Conflicts:
includes/account.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
|
|
Conflicts:
includes/account.php
pages/account/6.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
|
|
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
|
|
|
|
|
|
|
|
|
|
information is required for account registration
Signed-off-by: Benny Baumann <BenBE@geshi.org>
|
|
|
|
|
|
|
|
Conflicts:
includes/account.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
|
|
|
|
|
|
|
|
- Fix HTML
- Correct spelling
- Improve translatability of variable string
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
|
|
|
|
of client and cert view
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
www/gpg.php
|