瀏覽代碼
Merge remote-tracking branch 'origin/sso'
Conflicts: ipu-server/.gitignore push-server/.gitignore
huangbo
+ 1
- 0
.gitignore
|
||
| 1 |
|
|
+ 15
- 5
ipu-server/.gitignore
|
||
| 1 |
|
|
| 2 |
|
|
| 3 |
|
|
| 1 |
|
|
| 2 |
|
|
| 3 |
|
|
| 4 |
|
|
| 5 |
|
|
| 6 |
|
|
| 7 |
|
|
| 8 |
|
|
| 9 |
|
|
| 4 | 10 |
|
| 11 |
|
|
| 5 | 12 |
|
| 6 |
|
|
| 7 |
|
|
| 13 |
|
|
| 14 |
|
|
| 15 |
|
|
| 16 |
|
|
| 17 |
|
|
+ 6
- 2
push-server/.gitignore
|
||
| 1 | 1 |
|
| 2 |
|
|
| 3 |
|
|
| 2 |
|
|
| 3 |
|
|
| 4 |
|
|
| 5 |
|
|
| 6 |
|
|
| 7 |
|
|