kyg516 a6c6c8b488 Merge branch 'master' of https://github.com/oss2016summer/gluster-web-interface ...

Conflicts:
	app/views/home/index.html.erb

2016-10-03 15:57:30 +09:00

..

assets

update peer status

2016-09-28 10:27:54 +00:00

controllers

update

2016-10-03 06:13:30 +00:00

helpers

Add volume status to home index

2016-10-03 15:56:43 +09:00

models

add login

2016-09-23 12:53:19 +00:00

uploaders

Update

2016-09-15 18:58:19 +09:00

views

Merge branch 'master' of https://github.com/oss2016summer/gluster-web-interface

2016-10-03 15:57:30 +09:00