|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|
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 'LICENSE')
0 files changed, 0 insertions, 0 deletions