Skip to content

Commit cb33eeb

Browse files
committed
Merge pull request #99 from flowplayer/develop
Version 1.12.0
2 parents bdad454 + 38c01b5 commit cb33eeb

30 files changed

Lines changed: 5324 additions & 432 deletions

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ module.exports = function(grunt) {
110110
// Task-specific options go here.
111111
},
112112
all: {
113-
src: ['frontend/assets/css/public.css', 'frontend/assets/drive/*.css'],
113+
src: ['frontend/assets/css/public.css', 'frontend/assets/drive/*.css', 'frontend/assets/magnific-popup/magnific-popup.css'],
114114
dest: 'frontend/assets/css/public-concat.css'
115115
},
116116
},

0 commit comments

Comments
 (0)