Merge branch 'develop' into 'master'

Update hello.txt on develop branch test branch merge See merge request !1

Merge branch 'develop' into 'master'
26b8768b · asd · 85256694 · fad55ff6 · 26b8768b
Commit 26b8768b authored 8 years ago by asd
--- a/hello.txt
+++ b/hello.txt
@@ -3,3 +3,4 @@ add text on pc

 edit hello.txt on gitlabnew modify on pc
 hi hello on gitlab ++
+modify on develop branch
\ No newline at end of file