Merge remote-tracking branch 'origin/master'

沈斌

2018-07-13 ba218bd17ed9b3bf1f330294714850a09ac71c17

 karma.conf.js

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