grafana 258 B

12345678910111213141516171819
  1. commit 2423f470ef62145c26e74511121eac01e554c363
  2. Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
  3. Date: Fri Nov 14 17:56:27 2014 +0100
  4. Merge with oss master
  5. diff --git a/src/app/p_app.js b/src/app/p_app.js
  6. index 2c9a813f8..55cec05dc 100644
  7. --- a/src/app/p_app.js
  8. +++ b/src/app/p_app.js
  9. @@ -77,6 +77,8 @@ function (angular, $, _, appLevelRequire, config) {
  10. });
  11. var preBootRequires = [
  12. + 'services/all',
  13. + 'features/all',
  14. 'controllers/all',
  15. 'directives/all',
  16. 'filters/all',