Merge "fix bug 41280, show correct content when displaying edit conflicts"
authorReedy <reedy@wikimedia.org>
Tue, 23 Oct 2012 20:31:33 +0000 (20:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Oct 2012 20:31:33 +0000 (20:31 +0000)
commitf39292c10b29b3578732018fb4f69a3219e90982
treedeb226fe0760803b77cd818a997e41c781b87d0a
parenta5156a353f8c68cc21dd895cda71ab8103b80195
parente80f3311d2cd81b0541834f78f7da6bf29f02270
Merge "fix bug 41280, show correct content when displaying edit conflicts"
includes/EditPage.php