Merge pull request #8269 from Hus274/8265

Adding a merchandise link to the marketplace selector
2016-12-09 11:57:36 -08:00
parent 29854d3bdb 8112d46ea4
commit eb2b46fc5d
1 changed files with 2 additions and 0 deletions
@@ -20,6 +20,8 @@ ul.options-menu
  li(ng-class="{ active: $state.includes('options.inventory.seasonalshop') }")
    a(ui-sref='options.inventory.seasonalshop')
      =env.t('seasonalShop')
+  li.pull-right
+    a(href='/static/merch')=env.t('merch')

 .tab-content
  .tab-pane.active