Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	media/archweb.css
	public/views.py
	urls.py

2 files changed, 5 insertions, 9 deletions

diff --git a/templates/devel/index.html b/templates/devel/index.html
index 54bb317d..b681a96e 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -89,15 +89,6 @@
         </tbody>
     </table>
 
-    <form id="dash-pkg-notify" method="post" action="/devel/notify/">{% csrf_token %}
-        <fieldset>
-            <p><input id="notify" name="notify" type="checkbox" value="yes"
-            {% if user.get_profile.notify %} checked="checked"{% endif %} />
-            <label for="notify">Notify me when packages are flagged out-of-date</label>
-            <input title="Update notification status" type="submit" value="Update" /></p>
-        </fieldset>
-    </form>
-
 </div><!-- #dev-dashboard -->
 
 <div id="dash-by-arch" class="dash-stats box">
diff --git a/templates/devel/new_account.txt b/templates/devel/new_account.txt
new file mode 100644
index 00000000..1159992a
--- /dev/null
+++ b/templates/devel/new_account.txt
@@ -0,0 +1,5 @@
+You can now log into https://{{ site.domain }}/login/ with these login details:
+Username: {{ user.username }}
+Password: {{ password }}
+
+Please update your profile once logged in and change your password.