diff options
| author | Benny Baumann <BenBE@geshi.org> | 2014-12-16 21:03:54 +0100 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2014-12-16 21:08:25 +0100 |
| commit | 0988a0c268653910f78a50e16d34edf14a89dc13 (patch) | |
| tree | 3c8bcc1e070b4c15825758e16b4a426a58cf1fe0 /cgi-bin | |
| parent | dd6c8d16286f10c22b0fe7e4908825e18db9d703 (diff) | |
| parent | 5596d4a37845019c6053c184a94689101a7d48a8 (diff) | |
| download | cacert-devel-bug-1131.tar.gz cacert-devel-bug-1131.tar.xz cacert-devel-bug-1131.zip | |
Merge branch 'release' into bug-1131bug-1131
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.
Diffstat (limited to 'cgi-bin')
0 files changed, 0 insertions, 0 deletions