Kevan Ahlquist 07dd08a6d0 Merge branch 'crosbymichael-master' into dist ...

Conflicts:
	app/app.js
	package.json

2015-09-09 23:06:19 -05:00

..

assets

Merge branch 'crosbymichael-master' into dist

2015-09-09 23:06:19 -05:00

templates

Merge branch 'crosbymichael-master' into dist

2015-09-09 23:06:19 -05:00

angular.js

Pulling latest into dist.

2015-08-24 20:46:58 -05:00

dockerui.css

Adding latest build to dist.

2015-02-18 01:06:23 -06:00

dockerui.js

Merge branch 'crosbymichael-master' into dist

2015-09-09 23:06:19 -05:00

index.html

Pulling latest into dist.

2015-08-24 20:46:58 -05:00