Merge branch 'master' into better-emails

emails/teaminvite.html

@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<h3>Invitation to join team {{ teamname }}</h3>
+
+{{ inviter | user_reference }} has invited you to join team <b>{{ teamname }}</b> under organization {{ organization | user_reference }}.
+
+<br><br>
+
+To join the team, please click the following link:<br>
+{{ app_link('confirminvite?code=' + token) }}
+
+<br><br>
+If you were not expecting this invitation, you can ignore this email.
+
+{% endblock %}