Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
includes/general.php
tverify/index.php
|
|
Conflicts:
pages/account/13.php
|
|
|
|
interface (see bug-612)
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(as in the pad of today's telco)
|
|
|
|
According to common decision in SAP meeting.
|
|
... to help people to see where the CSR should go.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|