IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into annotations_redesign

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-07-16 13:18:21 +02:00
parent 9eb9bd8488 1c56ac7e48
commit b47047a91d
9 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tasks/options/concat.js
+2 -2
View File
@@ -3,10 +3,10 @@ module.exports = function(config) {
css: {
src: [
'<%= srcDir %>/css/normalize.min.css',
'<%= srcDir %>/css/bootstrap.dark.min.css',
'<%= srcDir %>/css/timepicker.css',
'<%= srcDir %>/css/spectrum.css',
'<%= srcDir %>/css/animate.min.css'
'<%= srcDir %>/css/animate.min.css',
'<%= srcDir %>/css/bootstrap.dark.min.css'
],
dest: '<%= srcDir %>/css/default.min.css'
},