Merge branch 'master' into user-invite

This commit is contained in:
JC Brand 2014-08-31 02:18:28 +02:00
commit 9f6e36e38d

View File

@ -2215,7 +2215,7 @@
renderPasswordForm: function () {
this.$el.find('span.centered.spinner').remove();
this.$el.find('.chat-body').append(
this.$el.find('.chat-body').html(
$('<div class="chatroom-form-container">'+
'<form class="chatroom-form">'+
'<legend>'+__('This chatroom requires a password')+'</legend>' +