diff options
| author | Sergio Benitez <sbenitez@mit.edu> | 2015-09-09 13:44:51 -0700 |
|---|---|---|
| committer | Sergio Benitez <sbenitez@mit.edu> | 2015-09-09 13:44:51 -0700 |
| commit | 964d0262ff353db6a50ed5be83ebd22f71aa6e69 (patch) | |
| tree | 8cbab6b6a9b4f62cbe9acb2a0b8752b531633362 /public/ng/js/gogs.js | |
| parent | 079a2d68db5c843ef2dbba65aeca46d5887d6b02 (diff) | |
| parent | b75d0378cbbf0523963fd9bc749543244be7392b (diff) | |
Merged conflicts.
Diffstat (limited to 'public/ng/js/gogs.js')
| -rw-r--r-- | public/ng/js/gogs.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js index df5c6aa3..f8048162 100644 --- a/public/ng/js/gogs.js +++ b/public/ng/js/gogs.js @@ -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; |