aboutsummaryrefslogtreecommitdiffstats
path: root/lib/views/outgoing_mailer
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-04-30 12:14:26 +0100
committerLouise Crow <louise.crow@gmail.com>2013-04-30 12:14:26 +0100
commit945fb4b52727115575bbb3941b1151cd21a6a60e (patch)
tree11c2b5304f8e10689caf6d27d14197cab1491c2a /lib/views/outgoing_mailer
parente90c170f84ab4b91b25c673045bc0bbec0c5788a (diff)
parentec01e0946dfab8db11e63ad565d18958a8fec1a6 (diff)
Merge remote-tracking branch 'mysociety_github/rails-3' into rails-3use-with-alaveteli-0.11rails-3
Diffstat (limited to 'lib/views/outgoing_mailer')
-rw-r--r--lib/views/outgoing_mailer/initial_request.text.erb (renamed from lib/views/outgoing_mailer/initial_request.rhtml)0
1 files changed, 0 insertions, 0 deletions
diff --git a/lib/views/outgoing_mailer/initial_request.rhtml b/lib/views/outgoing_mailer/initial_request.text.erb
index a172b41..a172b41 100644
--- a/lib/views/outgoing_mailer/initial_request.rhtml
+++ b/lib/views/outgoing_mailer/initial_request.text.erb