libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/i18n

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2012-11-13 08:47:38 -08:00
commit c008d7bbbe
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/frontend/specs/button_ordered_list.js
View file

@ -17,7 +17,7 @@ describe("assign ordered list", function(){
}).done(done);
});
it("keeps the numbered list on enter for the new line - EMULATES PASTING INTO A PAD", function(done){
xit("issue #1125 keeps the numbered list on enter for the new line - EMULATES PASTING INTO A PAD", function(done){
var inner$ = helper.padInner$;
var chrome$ = helper.padChrome$;

2
tests/frontend/specs/change_user_name.js
View file

@ -34,7 +34,7 @@ describe("change username value", function(){
done();
}
});
}, 0);
}, 1000);
});