Skip to content

Commit

Permalink
Merge pull request #2841 from bensternthal/Fix-Bug-1143911-Add-Conf
Browse files Browse the repository at this point in the history
Fix Bug 1143911: Add MDN Conference To List Of Trademarks.
  • Loading branch information
sgarrity committed Mar 17, 2015
2 parents 9c41afa + d8c3f6d commit 71f5711
Showing 1 changed file with 1 addition and 0 deletions.
Expand Up @@ -138,6 +138,7 @@ <h1 class="page-title">{{ _('List of Mozilla Trademarks') }}</h1>
<li>mozilla.org&reg;</li>
<li>Minimo&reg;</li>
<li>Sunbird&reg;</li>
<li>View Source&trade;</li>
<li>XUL&trade;</li>
</ul>

Expand Down

0 comments on commit 71f5711

Please sign in to comment.