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
controllers
helpers
models
uploaders
views	Merge branch 'master' of https://github.com/oss2016summer/gluster-web-interface	2016-10-03 15:57:30 +09:00