Merge v2.5 work

This commit is contained in:
Jeremy Stretch
2018-12-07 10:51:28 -05:00
396 changed files with 8663 additions and 6511 deletions

View File

@@ -1,4 +1,4 @@
{% load static from staticfiles %}
{% load static %}
{% load helpers %}
<!DOCTYPE html>
<html lang="en">