github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity
portainer/test
History
Kevan Ahlquist 2514672c35 Merge commit '964eac6d530a7600459f92c312d79ee9365b0f9b' into events 
Conflicts:
	app/app.js
	test/unit/app/components/containerController.spec.js
 		2015-04-18 21:26:15 -07:00
..
assets/angular Angular version bump to 1.3.15. 2015-03-27 15:16:44 -05:00
unit Merge commit '964eac6d530a7600459f92c312d79ee9365b0f9b' into events 2015-04-18 21:26:15 -07:00