Merge V2 branch

2015-02-24 14:05:43 +10:00
parent 5adaad5bf8
commit 138494c4b1
82 changed files with 8952 additions and 4985 deletions
--- a/three_d_viewer/templates/three_d_viewer/glossary.html
+++ b/three_d_viewer/templates/three_d_viewer/glossary.html
@@ -8,7 +8,7 @@
 	{% for entry in entries %}
 		<tr>
 			<td class="term"><p>{{ entry.name }}</p></td>
-			<td><p>{{ entry.definition }}</p></td>
+			<td><p>{{ entry.definition|safe }}</p></td>
 		</tr>
 	{% endfor %}
 	</table>