Age | Commit message (Collapse) | Author |
|
|
|
conflicts when integrating both together
|
|
|
|
|
|
|
|
|
|
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>
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
Conflicts:
www/gpg.php
|
|
|
|
Conflicts:
pages/account/6.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
Conflicts:
pages/account/10.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
Conflicts:
includes/account.php
pages/account/10.php
pages/account/3.php
pages/gpg/0.php
www/gpg.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
Conflicts:
includes/account.php
pages/account/10.php
pages/account/3.php
pages/gpg/0.php
www/gpg.php
|
|
for HTML in pages/account/5.php
|
|
|
|
|
|
|
|
Conflicts:
includes/temp_functions.php
pages/account/43.php
|
|
Conflicts:
includes/account.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
space /tabs, typo and added orginfo.O to order in SQL statement
|
|
|