Commits · ec5eaf0314970b8a8947f57cb614974911ee6c7a · mobile-group / galaxy-iOS

20 Dec, 2023 10 commits
- Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop · ec5eaf03
  David黄金龙 authored Dec 20, 2023
```
# Conflicts:
#	galaxy/Podfile

处理冲突
```
  ec5eaf03
- 添加忽略文件 · 2fae0d30
  David黄金龙 authored Dec 20, 2023
```
添加依赖库
```
  2fae0d30
- podfile 修改 · 0b3fe85e
  pete谢兆麟 authored Dec 20, 2023
  
  0b3fe85e
- Merge commit '384b3036 ' into davidhuang · 38bbc048
  David黄金龙 authored Dec 20, 2023
  
  38bbc048
- 删除不需要跟踪的文件 · 62f90b99
  David黄金龙 authored Dec 20, 2023
  
  62f90b99
- // delete pods · 384b3036
  Steven杜宇 authored Dec 20, 2023
  
  384b3036
- 1 · 1eac36ca
  David黄金龙 authored Dec 20, 2023
  
  1eac36ca
- no message · 02ad963a
  David黄金龙 authored Dec 20, 2023
  
  02ad963a
- 修改忽略文件位置 · 52cc3eca
  David黄金龙 authored Dec 20, 2023
  
  52cc3eca
- test · 95f9cd95
  David黄金龙 authored Dec 20, 2023
  
  95f9cd95
19 Dec, 2023 16 commits
- no message · 8bec8b71
  David黄金龙 authored Dec 19, 2023
  
  8bec8b71
- Merge branch 'davidhuang' into develop · e43c2413
  David黄金龙 authored Dec 19, 2023
  
  e43c2413
- 添加pod 文件 · 0fc671f8
  David黄金龙 authored Dec 19, 2023
  
  0fc671f8
- 1、添加忽略文件 · 1cd48f61
  David黄金龙 authored Dec 19, 2023
```
2、添加网络监控第三方模块
```
  1cd48f61
- 123 · 1f37867a
  pete谢兆麟 authored Dec 19, 2023
  
  1f37867a
- Merge branch 'davidhuang' into develop · b8aa0547
  David黄金龙 authored Dec 19, 2023
  
  b8aa0547
- Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop · b65a4058
  Steven杜宇 authored Dec 19, 2023
```
# Conflicts:
#	test.txt
```
  b65a4058
- // test · b7efd151
  Steven杜宇 authored Dec 19, 2023
  
  b7efd151
- 123 · 4a5f771c
  pete谢兆麟 authored Dec 19, 2023
  
  4a5f771c
- 添加初始化工程 · 592ee069
  David黄金龙 authored Dec 19, 2023
  
  592ee069
- // test · 9c870671
  steven.dy authored Dec 19, 2023
  
  9c870671
- Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop · cd795e4e
  steven.dy authored Dec 19, 2023
  
  cd795e4e
- test · dc7d09ed
  steven.dy authored Dec 19, 2023
  
  dc7d09ed
- 测试 · fac81f99
  pete谢兆麟 authored Dec 19, 2023
  
  fac81f99
- test · d8a7b4ba
  David黄金龙 authored Dec 19, 2023
  
  d8a7b4ba
- hjl · fdca8e07
  David黄金龙 authored Dec 19, 2023
  
  fdca8e07