Merge branch 'reasons' into 'master'
commit8041d5d3357d1a6b0d564c7590e07ad85d321676
authorBarry Warsaw <barry@python.org>
Tue, 12 May 2015 01:32:46 +0000 (12 01:32 +0000)
committerBarry Warsaw <barry@python.org>
Tue, 12 May 2015 01:32:46 +0000 (12 01:32 +0000)
tree6cc26448b1cd1fb638df7a7d6d7528aec90d2161
parentd6e93bd29f06f0b4d73e455c0170ee1616a17e21
parente8514abd591504f70c131d08ec9fd2a53c914e9e
Merge branch 'reasons' into 'master'

Implement reasons for why a message is being held for moderator approval.

Given by AurĂ©lien Bompard, tweaked by Barry Warsaw.

Remove the inaccurate confirmation url and admindb urls from the substitution
dictionaries for postauth.txt and posthold.txt, and the templates.

See merge request !10