Merge lp:~yoboy-leguesh/ubuntu-fr-doc/dev2prod into lp:ubuntu-fr-doc
Proposed by
YoBoY
Status: | Merged |
---|---|
Approved by: | xapantu |
Approved revision: | 79 |
Merged at revision: | 79 |
Proposed branch: | lp:~yoboy-leguesh/ubuntu-fr-doc/dev2prod |
Merge into: | lp:ubuntu-fr-doc |
Diff against target: |
148 lines (+52/-15) 6 files modified
.bzrignore (+1/-2) conf/acl.auth.php (+13/-8) conf/interwiki.local.conf (+1/-0) conf/local.php (+6/-5) conf/local.protected.php.dist (+29/-0) robots.txt (+2/-0) |
To merge this branch: | bzr merge lp:~yoboy-leguesh/ubuntu-fr-doc/dev2prod |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
xapantu | Pending | ||
Review via email: mp+47193@code.launchpad.net |
This proposal supersedes a proposal from 2011-01-23.
Description of the change
Intégration des modifications présentes dans la branche wiki.dev, à savoir :
* suppression du local.protected.php
* ajout d'un local.protected
* prise en charge des URL apt:// dans les liens interwiki
* modification des ACL
To post a comment you must log in.