| Property changes on: branches/wmf-deployment/extensions/TitleKey |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/extensions/TitleKey:r54715 |
| Property changes on: branches/wmf-deployment/extensions/WikimediaMessages |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /trunk/extensions/WikimediaMessages:r54715 |
| Property changes on: branches/wmf-deployment/extensions/MWSearch/MWSearch_body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Merged /trunk/extensions/MWSearch/MWSearch_body.php:r54715 |
| Property changes on: branches/wmf-deployment/extensions/MWSearch |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 4 | 4 | Merged /trunk/extensions/MWSearch:r54715 |
| Property changes on: branches/wmf-deployment/extensions/SecurePoll/includes/Base.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 5 | 5 | Merged /trunk/extensions/SecurePoll/includes/Base.php:r54715 |
| Property changes on: branches/wmf-deployment/extensions/SecurePoll/cli/testDebian.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 6 | 6 | Merged /trunk/extensions/SecurePoll/cli/testDebian.php:r54715 |
| Property changes on: branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 7 | 7 | Merged /trunk/extensions/SecurePoll/cli/wm-scripts:r54715 |
| Property changes on: branches/wmf-deployment/extensions/SecurePoll/resources/SecurePoll.css |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 8 | 8 | Merged /trunk/extensions/SecurePoll/resources/SecurePoll.css:r54715 |
| Property changes on: branches/wmf-deployment/extensions/SecurePoll/resources/SecurePoll.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 9 | 9 | Merged /trunk/extensions/SecurePoll/resources/SecurePoll.js:r54715 |
| Property changes on: branches/wmf-deployment/extensions/SecurePoll |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 10 | 10 | Merged /trunk/extensions/SecurePoll:r54715 |
| Property changes on: branches/wmf-deployment/extensions/Collection |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 11 | 11 | Merged /trunk/extensions/Collection:r54715 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/EditToolbar/images |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 12 | 12 | Merged /trunk/extensions/UsabilityInitiative/EditToolbar/images:r54715 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 13 | 13 | Merged /trunk/extensions/UsabilityInitiative:r54715 |
| Index: branches/wmf-deployment/extensions/TrustedXFF/trusted-hosts.txt |
| — | — | @@ -322,6 +322,7 @@ |
| 323 | 323 | rgm-ip-ccache-1-vif0.telkom-ipnet.co.za |
| 324 | 324 | tpr-ip-ccache-1-vif0.telkom-ipnet.co.za |
| 325 | 325 | tbnb-ip-ccache-1-vif0.telkom-ipnet.co.za |
| | 326 | +wbs-ip-ccache-4-vif0.telkom-ipnet.co.za |
| 326 | 327 | rrba-ip-ccache-3-vif0.telkom-ipnet.co.za |
| 327 | 328 | rrba-ip-ccache-4-vif0.telkom-ipnet.co.za |
| 328 | 329 | wblv-ip-rcache-3-vif0.telkom-ipnet.co.za |
| — | — | @@ -334,6 +335,7 @@ |
| 335 | 336 | wbs-ip-ccache-2-vif0.telkom-ipnet.co.za |
| 336 | 337 | wbs-ip-ccache-3-vif0.telkom-ipnet.co.za |
| 337 | 338 | rrba-ip-ccache-7-vif0.telkom-ipnet.co.za |
| | 339 | +nngy-ip-ccache-2-vif0.telkom-ipnet.co.za |
| 338 | 340 | ndn-ip-ccache-2-vif0.telkom-ipnet.co.za |
| 339 | 341 | rnls-ip-ccache-1-vif0.telkom-ipnet.co.za |
| 340 | 342 | rhwh-ip-ccache-1-vif0.telkom-ipnet.co.za |
| — | — | @@ -341,6 +343,7 @@ |
| 342 | 344 | tvwt-ip-ccache-1-vif0.telkom-ipnet.co.za |
| 343 | 345 | tprn-ip-ccache-1-vif0.telkom-ipnet.co.za |
| 344 | 346 | ndnn-ip-ccache-1-vif0.telkom-ipnet.co.za |
| | 347 | +wblv-ip-pcache-4-vif0.telkom-ipnet.co.za |
| 345 | 348 | wblv-ip-pcache-1-vif0.telkom-ipnet.co.za |
| 346 | 349 | wblv-ip-pcache-5-vif0.telkom-ipnet.co.za |
| 347 | 350 | rrba-ip-pcache-2-vif0.telkom-ipnet.co.za |
| Property changes on: branches/wmf-deployment/extensions/CentralAuth |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 348 | 351 | Merged /trunk/extensions/CentralAuth:r54715 |
| Property changes on: branches/wmf-deployment/extensions/MetavidWiki/skins/add_media_wizard.OFF.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 349 | 352 | Merged /trunk/extensions/MetavidWiki/skins/add_media_wizard.OFF.js:r54715 |
| Property changes on: branches/wmf-deployment/extensions/FlaggedRevs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 350 | 353 | Merged /trunk/extensions/FlaggedRevs:r54715 |
| Property changes on: branches/wmf-deployment/extensions/CodeReview |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 351 | 354 | Merged /trunk/extensions/CodeReview:r54715 |
| Property changes on: branches/wmf-deployment/extensions/SyntaxHighlight_GeSHi |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 352 | 355 | Merged /trunk/extensions/SyntaxHighlight_GeSHi:r54715 |
| Property changes on: branches/wmf-deployment/extensions/HoneypotIntegration |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 353 | 356 | Merged /trunk/extensions/HoneypotIntegration:r54715 |
| Property changes on: branches/wmf-deployment/extensions/timeline |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 354 | 357 | Merged /trunk/extensions/timeline:r54715 |
| Property changes on: branches/wmf-deployment/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 355 | 358 | Merged /trunk/extensions:r54715 |