Merge branch 'develop' into 'master'

Update hello.txt in develop branch See merge request !1

Merge branch 'develop' into 'master'
fa805c54 · Lee Hyeong Jin · 525bacbe · a2332852 · fa805c54
Commit fa805c54 authored 8 years ago by Lee Hyeong Jin
--- a/hello.txt
+++ b/hello.txt
-Edit in Web_hello~
\ No newline at end of file
+Edit in Web_hello~
+modify in branch "delvelop"
\ No newline at end of file