opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 07:23:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:torkelo/grafana-private into pro

Browse Source 
Conflicts:
	src/app/app.js
	src/app/controllers/all.js
	src/app/routes/all.js
	src/app/services/datasourceSrv.js
	src/test/test-main.js
This commit is contained in:
Torkel Ödegaard
2014-12-31 12:07:22 +01:00
parent 11b44f2b01 d1e33ec071
commit 75c77a44c9
98 changed files with 226 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/options/requirejs.js
View File

@ -63,7 +63,7 @@ module.exports = function(config,grunt) {
'directives/all',
'filters/all',
'controllers/all',
'routes/all',
'routes/standalone/default',
'components/partials',
]
}