Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

Merge branch 'master' into events

Browse source 
Conflicts:
	app/app.js
	index.html
This commit is contained in:
Kevan Ahlquist 2015-05-14 01:33:08 -05:00
commit ef3596ff32
25 changed files with 616 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/unit/karma.conf.js
View file

@ -11,6 +11,7 @@ files = [
'assets/js/spin.js',
'dist/angular.js',
'assets/js/ui-bootstrap/ui-bootstrap-custom-tpls-0.12.0.min.js',
'assets/js/angular-vis.js',
'test/assets/angular/angular-mocks.js',
'app/**/*.js',
'test/unit/**/*.spec.js',
@ -55,4 +56,4 @@ browsers = ['Chrome'];
// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun = true;
singleRun = true;