Merge branch 'keyboard-binding-new-topics-banner' into dismiss-keyboard-bindings

Conflicts: app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
2014-08-29 09:36:34 -04:00
parent ede9d1e057 cde64580b1
commit 096bc0c0ae
118 changed files with 1583 additions and 1067 deletions
@@ -20,6 +20,6 @@ test("Visit Discovery Pages", function() {

  visit("/top");
  andThen(function() {
-    ok(exists('.topic-list tr td.main-link'), "has topics");
+    ok(exists('.topic-list .topic-list-item'), "has topics");
  });
 });