Merge branch 'master' into tests/diana/update-oe-unit-tests

This commit is contained in:
Diana Huang
2013-01-25 16:37:41 -05:00

View File

@@ -24,8 +24,8 @@
<section class="bottom">
<section class="copyright">
## <p>&copy; 2012 edX, <a href="${reverse('copyright')}">some rights reserved.</a></p> # TODO: (bridger) Update the copyright for edX, then re-enable the link.
<p>&copy; 2012 edX, some rights reserved.</p>
## <p>&copy; 2013 edX, <a href="${reverse('copyright')}">some rights reserved.</a></p> # TODO: (bridger) Update the copyright for edX, then re-enable the link.
<p>&copy; 2013 edX, some rights reserved.</p>
</section>
<section class="secondary">