Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00
Code Packages Activity Actions 5

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

Browse source 
Conflicts:
	config/locales/client.en.yml
This commit is contained in:
cpradio 2014-08-29 20:05:59 -04:00
commit 2e200ffbf0
10 changed files with 39 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/javascripts/components/keyboard-shortcuts-test.js.es6
View file

@ -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>",