Merged conflicts.

This commit is contained in:
Sergio Benitez 2015-09-09 13:44:51 -07:00
commit 964d0262ff
952 changed files with 1344 additions and 1161 deletions

View file

@ -932,6 +932,10 @@ $(document).ready(function () {
$('#pull-issue-preview').markdown_preview(".issue-add-comment");
homepage();
emojify.setConfig({
img_dir: Gogs.AppSubUrl + '/img/emoji'
});
emojify.run();
// Fix language drop-down menu height.
var l = $('#footer-lang li').length;