Merge branch 'release' into hotfix/2016-01-28_release_into_master

This commit is contained in:
Douglas Hall
2016-01-28 12:40:00 -05:00
2 changed files with 2 additions and 2 deletions

View File

@@ -8,6 +8,7 @@
%>
<div class='exam-text'>
<%= interpolate_text('You are taking "{exam_link}" as a {exam_type} exam. The timer on the right shows the time remaining in the exam.', {exam_link: "<a href='" + exam_url_path + "'>"+gtLtEscape(exam_display_name)+"</a>", exam_type: (!_.isUndefined(arguments[0].exam_type)) ? exam_type : gettext('timed')}) %>
<%- gettext('To receive credit on a problem, you must click "Check" or "Final Check" on it before you select "End My Exam".') %>
</div>
<div id="turn_in_exam_id" class="pull-right turn_in_exam">
<span>
@@ -24,4 +25,3 @@
</span>
</div>
</div>