[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

[Chris Lamb]

The following commit has been merged in the master branch:
commit 32c13aed7ca70418f04acb38da66dac2c71852e5
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 29 19:47:50 2010 -0400

    Add missing registration/activate.html template.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/templates/registration/activate.html b/templates/registration/activate.html
new file mode 100644
index 0000000..1341e2e
--- /dev/null
+++ b/templates/registration/activate.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+{% if account %}
+  <h1>Account validated</h1>
+  <p>You may now <a href="{% url auth_login %}">login</a> and start using your account.</p>
+{% else %}
+  <h1>Registration key invalid</h1>
+  <p>Did you copy it from the email correctly?</p>
+{% endif %}
+
+{% endblock %}

-- 
live-studio