Merge 4.5

Conflicts:
	js/expand-too-long.js
This commit is contained in:
czaks 2014-06-10 17:51:03 +02:00
commit c2cbbe7e22
4 changed files with 5 additions and 4 deletions

View file

@ -23,7 +23,7 @@ $(function() {
url: url,
context: document.body,
success: function(data) {
var content = $(data).find('#'+url.split('#')[1]).next().next().html();
var content = $(data).find('#'+url.split('#')[1]).parent().find(".body").html();
body.html(content);
}