Merge "Expose the log_id of the deletion log entry in the action=delete API"
authorSiebrand <s.mazeland@xs4all.nl>
Sun, 1 Jul 2012 15:55:29 +0000 (15:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 1 Jul 2012 15:55:29 +0000 (15:55 +0000)
1  2 
docs/hooks.txt
includes/Article.php
includes/FileDeleteForm.php
includes/Title.php
includes/WikiPage.php
includes/api/ApiDelete.php
includes/specials/SpecialMovepage.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
maintenance/language/messages.inc

diff --cc docs/hooks.txt
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge