Skip to content

E
edx-platform
Commit a56658fd by Calen Pennington
Options

Merge pull request #175 from MITx/jarv/update-activation 

updating activation mail, adding Gemfile.lock to gitignore
parents 0d235220 5449503d
Showing with 2 additions and 1 deletions
.gitignore
...@@ -21,3 +21,4 @@ reports/ ...@@ -21,3 +21,4 @@ reports/
/src/ /src/
\#*\# \#*\#
*.egg-info *.egg-info
Gemfile.lock
lms/templates/emails/activation_email.txt
...@@ -6,7 +6,7 @@ this address into your web browser's address bar: ...@@ -6,7 +6,7 @@ this address into your web browser's address bar:
% if is_secure: % if is_secure:
https://${ site }/activate/${ key } https://${ site }/activate/${ key }
% else: % else:
http://edx4edx.mitx.mit.edu/activate/${ key } http://${ site }/activate/${ key }
% endif % endif
If you didn't request this, you don't need to do anything; you won't If you didn't request this, you don't need to do anything; you won't
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment