Merge branch 'testing' of https://github.com/draperlaboratory/stout into testing
authorAlex Ford <aford@draper.com>
Thu, 3 Dec 2015 22:44:52 +0000 (17:44 -0500)
committerAlex Ford <aford@draper.com>
Thu, 3 Dec 2015 22:44:52 +0000 (17:44 -0500)
commitdcd68be34c1f78d4ad0188d16bce3c88d838b381
treec288189204d6d188d6b48a2c8d9b0e3bb0aa42f1
parentbc1c9b219627271b1b135ea7bc890d7d74389d96
parent5f145edaae8e5fd9b1ac03d0820fc34e3bf9bd28
Merge branch 'testing' of https://github.com/draperlaboratory/stout into testing

Conflicts:
op_tasks/templates/intro.html
op_tasks/templates/registration/login.html
op_tasks/templates/registration/register.html
xdata/templates/page.html
op_tasks/templates/intro.html
op_tasks/templates/registration/login.html
op_tasks/templates/registration/register.html
xdata/templates/page.html