 a
|
14d9f7225e
resolve conflict in file1 while merging master to test1
|
1 jaar geleden |
|
a
|
21f5b8c4cb
add multiple lines in guide
|
1 jaar geleden |
|
a
|
2392cb07ac
add README and modify file1
|
1 jaar geleden |
|
a
|
468f5f5c22
add new lines in file1 and guide
|
1 jaar geleden |
|
a
|
67fdfaec0d
add index.php
|
1 jaar geleden |
|
a
|
1c69fa0079
minor changes in file1 and guide
|
1 jaar geleden |
|
a
|
4021a41413
Merge branch 'master' of https://git.hostfl.ru/sergei_mn/test into dev
|
1 jaar geleden |
|
a
|
9f3fac70dc
add file1.txt
|
1 jaar geleden |
 a
|
3eacc5de75
initial commit
|
1 jaar geleden |