Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics

Conflicts: config/locales/client.en.yml
2025-05-22 20:41:24 +08:00 · 2014-08-29 20:05:59 -04:00
parent 875b39fb5f cb45d5fa25
commit 2e200ffbf0
10 changed files with 39 additions and 24 deletions
--- a/test/javascripts/components/keyboard-shortcuts-test.js.es6
+++ b/test/javascripts/components/keyboard-shortcuts-test.js.es6
@ -46,6 +46,8 @@ module("Discourse.KeyboardShortcuts", {
      "  <button class='star'></button>",
      "  <button class='create'></button>",
      "  <button class='share'></button>",
+      "  <button id='dismiss-new-top'></button>",
+      "  <button id='dismiss-topics-top'></button>",
      "</div>",
      "<div class='alert alert-info clickable'></div>",
      "<button id='create-topic'></button>",