Merge remote-tracking branch 'origin/develop' into develop

沈斌

2017-12-20 b5ce833799753acd0944e6901b8101f03263e1fa

 karma.conf.js

@@ -28,6 +28,7 @@
    logLevel: config.LOG_INFO,
    autoWatch: true,
    browsers: ['Chrome'],
    singleRun: false
    singleRun: false,
    browserNoActivityTimeout: 60000 
  });
};