test / demo

Go to a project
Toggle navigation Toggle navigation pinning
Shenlin
6c66a860 2 parents 54357a27 1448215f

Merge branch 'develop' into 'master' 

Develop



See merge request !1
Inline Side-by-side
Showing 1 changed file with 24 additions and 1 deletions
1 测试 2016-10-20 1 测试 2016-10-20
2 2
3 -new stat
...\ No newline at end of file ...\ No newline at end of file
3 +new stat
4 +
5 +
6 +
7 +new branch for cherry pick
8 +
9 +18：36
10 +
11 +
12 +
13 +develop modified
14 +
15 +18:50
16 +
17 +new time
18 +
19 +Br is new update
20 +br update
21 +conflict solved
22 +conflict solved again
23 +
24 +
25 +
26 +完成br功能，合并到develop
...\ No newline at end of file ...\ No newline at end of file
......