Revert "Revert "Merge pull request #583 from git-marijus/master""

This reverts commit 08638f3ec8.
This commit is contained in:
marijus
2014-09-11 10:35:19 +02:00
parent 8bf4b5e776
commit 8835f646ae
9 changed files with 785 additions and 19 deletions

View File

@@ -10,10 +10,13 @@ head_add_css('library/colorbox/colorbox.css');
head_add_css('view/css/conversation.css');
head_add_css('view/css/widgets.css');
head_add_css('library/justifiedGallery/dist/css/justifiedGallery.css');
head_add_js('jquery.js');
head_add_js('jquery-migrate-1.1.1.js');
head_add_js('library/justifiedGallery/dist/js/jquery.justifiedGallery.js');
//head_add_js('jquery-compat.js');
head_add_js('spin.js');
head_add_js('jquery.spin.js');