Merge branch 'master' of git.gmu.edu:srct/roomlist

c571fe57 · Daniel W Bond · b6fd839c · e45d72c5 · c571fe57
Commit c571fe57 authored Dec 05, 2015 by Daniel W Bond
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

roomlist/accounts/templates/search/indexes/accounts/student_text.txt ...counts/templates/search/indexes/accounts/student_text.txt +2 -1

No files found.
--- a/roomlist/accounts/templates/search/indexes/accounts/student_text.txt
+++ b/roomlist/accounts/templates/search/indexes/accounts/student_text.txt
 {{ object.user.username }}
-{{ object.user.get_full_name_or_uname }}
+{{ object.user.first_name }}
+{{ object.user.last_name }}