grafana 285 B

12345678910111213141516171819
  1. commit 4e542d8b83844f8faa4d5ae3edab593950aaa344
  2. Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
  3. Date: Thu Dec 18 15:41:01 2014 +0100
  4. Changed config.js to backend generated config.js
  5. diff --git a/src/app/components/require.config.js b/src/app/components/require.config.js
  6. index 8ff6e8254..5a0a2662f 100644
  7. --- a/src/app/components/require.config.js
  8. +++ b/src/app/components/require.config.js
  9. @@ -6,7 +6,7 @@ require.config({
  10. paths: {
  11. app: 'p_app',
  12. - config: ['../config', '../config.sample'],
  13. + config: ['../../frontend/config'],
  14. settings: 'components/settings',
  15. kbn: 'components/kbn',
  16. store: 'components/store',