github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity
portainer/app
History
Kevan Ahlquist ef3596ff32 Merge branch 'master' into events 
Conflicts:
	app/app.js
	index.html
 		2015-05-14 01:33:08 -05:00
..
components Merge branch 'master' into events 2015-05-14 01:33:08 -05:00
shared Revert "DockerUI - Comment in Services was broken link. Updated the comment to include the most accurate link representing the Docker API reference material" 2015-05-14 00:27:55 -05:00
app.js Merge branch 'master' into events 2015-05-14 01:33:08 -05:00