Commit ca0cb5b7 by Diana Huang

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

parents 9f6afcb6 faaf290e
......@@ -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">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment