Age | Commit message (Collapse) | Author |
|
|
|
deleted self-referenced-ly) anyway
|
|
|
|
|
|
|
|
Conflicts:
pages/wot/6.php
www/policy/CAcertCommunityAgreement.php
The conflict in the CCA document page was introduced due to the rename of the file.
This instance can be safely ignored, as bug 1131 introduces a new version
superseeding the old document.
The instance in pages/wot/6.php is a bit more complicated, but basically
results from a change of bug 1137 and the modified paths to the policy documents.
|
|
|
|
|
|
|
|
Conflicts:
scripts/send_policy_cca_20140916.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
includes/account.php
scripts/cron/warning.php
www/disputes.php
www/wot.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
According to common decision in SAP meeting.
|
|
... to help people to see where the CSR should go.
|
|
(copied from somewhere above)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Additionally trailing whitespaces, indentation and line breaks have been
partially edited to ease reading of the HTML code.
The CCA has been skipped to avoid race conditions with other currently
running processes.
|