Merge branch 'master' into tests/diana/update-oe-unit-tests
This commit is contained in:
@@ -24,8 +24,8 @@
|
||||
|
||||
<section class="bottom">
|
||||
<section class="copyright">
|
||||
## <p>© 2012 edX, <a href="${reverse('copyright')}">some rights reserved.</a></p> # TODO: (bridger) Update the copyright for edX, then re-enable the link.
|
||||
<p>© 2012 edX, some rights reserved.</p>
|
||||
## <p>© 2013 edX, <a href="${reverse('copyright')}">some rights reserved.</a></p> # TODO: (bridger) Update the copyright for edX, then re-enable the link.
|
||||
<p>© 2013 edX, some rights reserved.</p>
|
||||
</section>
|
||||
|
||||
<section class="secondary">
|
||||
|
||||
Reference in New Issue
Block a user