Merge remote-tracking branch 'origin'

VERSION

@@ -1 +1 @@
-0.10.11
+0.10.12

core/views.py

@@ -36,6 +36,7 @@
 from django.utils.translation import ugettext as _
 from django.utils.encoding import force_bytes
 from django.views.decorators.cache import never_cache
+from termsandconditions.models import TermsAndConditions
 
 from django.contrib.auth.models import User
 from core.models import UserProfile
@@ -254,7 +255,15 @@ def new_full_name(extension):
 
 @login_required
 def personal_data(request):
+
+    terms = TermsAndConditions.objects.filter(
+        userterms__user=request.user
+    ).order_by(
+        '-userterms__date_accepted'
+    ).first()
+
     ctx = {
+        'terms': terms,
     }
     return render(request, 'accounts/personal_data.html', ctx)