提交 · c4676655788e2bfd24512d465489d81ac4a95d57 · 拥抱太阳的月亮405 / 开源项目

“76cc7b284f2ce32d123d44e77e08028962bd6985”上不存在“projects/yangxuan8282/imports.yml”

21 12月, 2020 23 次提交
- Merge branch 'master' of codechina.csdn.net:codechina/mirrors-settings · c4676655
  由 ️是纱雾酱哟～提交于 12月 21, 2020
```
Signed-off-by: べ断桥烟雨ミ <Legend_1949@126.com>

# Conflicts:
#	projects/lukesampson/imports.yml
```
  c4676655
- Merge branch 'p3100' into 'master' · 4134f0ba
  由 BaiXuePrincess 提交于 12月 21, 2020
```
'3001-3100'

See merge request codechina/mirrors-settings!85
```
  4134f0ba
- '3001-3100' · bb37b40b
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  bb37b40b
- Merge branch 'p2000' into 'master' · d20d8b5b
  由 BaiXuePrincess 提交于 12月 21, 2020
```
'1901-2000'

See merge request codechina/mirrors-settings!84
```
  d20d8b5b
- '1901-2000' · eb13cc4b
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  eb13cc4b
- 删除 workspace.xml · 3c273946
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  3c273946
- Merge branch 'p1900' into 'master' · cbf313ff
  由 BaiXuePrincess 提交于 12月 21, 2020
```
'1801-1900'

See merge request codechina/mirrors-settings!83
```
  cbf313ff
- Merge branch 'master' into 'p1900' · b438d0c3
  由 BaiXuePrincess 提交于 12月 21, 2020
```
# Conflicts:
#   .idea/workspace.xml
```
  b438d0c3
- '1801-1900' · fd1ec3f3
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  fd1ec3f3
- Merge branch 'p1800' into 'master' · 35f0f9fb
  由 BaiXuePrincess 提交于 12月 21, 2020
```
'1701-1800'

See merge request codechina/mirrors-settings!82
```
  35f0f9fb
- '1701-1800' · cf9a6667
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  cf9a6667
- Merge branch 'p1700' into 'master' · 27b94796
  由 BaiXuePrincess 提交于 12月 21, 2020
```
'1601-1700'

See merge request codechina/mirrors-settings!81
```
  27b94796
- '1601-1700' · 68a199ec
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  68a199ec
- Merge branch 'p1600' into 'master' · cd5b4575
  由 BaiXuePrincess 提交于 12月 21, 2020
```
'1501-1600'

See merge request codechina/mirrors-settings!80
```
  cd5b4575
- '1501-1600' · 9da86250
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  9da86250
- Merge branch 'p1500' into 'master' · 96edb2a5
  由 BaiXuePrincess 提交于 12月 21, 2020
```
'1401-1500'

See merge request codechina/mirrors-settings!79
```
  96edb2a5
- '1401-1500' · 49a8754a
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  49a8754a
- Merge branch 'p1400' into 'master' · a6df2d9d
  由 BaiXuePrincess 提交于 12月 21, 2020
```
'1301-1400'

See merge request codechina/mirrors-settings!78
```
  a6df2d9d
- '1301-1400' · d13a5d3f
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  d13a5d3f
- Merge branch 'p1300' into 'master' · 79ea1e03
  由 BaiXuePrincess 提交于 12月 21, 2020
```
'1201-1300'

See merge request codechina/mirrors-settings!77
```
  79ea1e03
- '1201-1300' · 4859c3ba
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  4859c3ba
- Merge branch 'p1200' into 'master' · 627251c2
  由 BaiXuePrincess 提交于 12月 21, 2020
```
'1101-1200'

See merge request codechina/mirrors-settings!76
```
  627251c2
- '1101-1200' · 744c840a
  由 BaiXuePrincess 提交于 12月 21, 2020
  
  744c840a
20 12月, 2020 4 次提交
- Merge branch 'develop' · cc1e74bf
  由 ️是纱雾酱哟～提交于 12月 20, 2020
```
Signed-off-by: べ断桥烟雨ミ <Legend_1949@126.com>
```
  cc1e74bf
- Merge branch 'scoop' into develop · 45ab5711
  由 ️是纱雾酱哟～提交于 12月 20, 2020
  
  45ab5711
- Update: 添加 Scoop 主程序及其内部预置的主要软件源（Buckets） · 8b587f11
  由 ️是纱雾酱哟～提交于 12月 20, 2020
```
Signed-off-by: べ断桥烟雨ミ <Legend_1949@126.com>
```
  8b587f11
- Update: 添加用于 IntelliJ IDEA 的 JSON Schema · 4a4d0ca9
  由 ️是纱雾酱哟～提交于 12月 20, 2020
```
方便用户在 IDE 内绑定模板，快速编写 imports.yml 文件
Signed-off-by: べ断桥烟雨ミ <Legend_1949@126.com>
```
  4a4d0ca9
19 12月, 2020 13 次提交
- Merge branch 'github_2900' into 'master' · 6d689515
  由 Miykael_xxm 提交于 12月 19, 2020
```
github_2900

See merge request codechina/mirrors-settings!74
```
  6d689515
- github_2900 · aa888b90
  由 Miykael_xxm 提交于 12月 19, 2020
  
  aa888b90
- Merge branch 'github_2800' into 'master' · f6e8185b
  由 Miykael_xxm 提交于 12月 19, 2020
```
github_2800

See merge request codechina/mirrors-settings!73
```
  f6e8185b
- github_2800 · f3613b1f
  由 Miykael_xxm 提交于 12月 19, 2020
  
  f3613b1f
- Merge branch 'github_2700' into 'master' · 88f569ce
  由 Miykael_xxm 提交于 12月 19, 2020
```
github_2700

See merge request codechina/mirrors-settings!72
```
  88f569ce
- github_2700 · 9f658ac4
  由 Miykael_xxm 提交于 12月 19, 2020
  
  9f658ac4
- Merge branch 'github_2600' into 'master' · 98b86328
  由 Miykael_xxm 提交于 12月 19, 2020
```
github_2600

See merge request codechina/mirrors-settings!71
```
  98b86328
- github_2600 · 60500bfe
  由 Miykael_xxm 提交于 12月 19, 2020
  
  60500bfe
- Merge branch 'github_2500' into 'master' · fda83028
  由 Miykael_xxm 提交于 12月 19, 2020
```
github_2500

See merge request codechina/mirrors-settings!70
```
  fda83028
- github_2500 · bf1f9734
  由 Miykael_xxm 提交于 12月 19, 2020
  
  bf1f9734
- Merge branch 'github_2400' into 'master' · 81830cd7
  由 Miykael_xxm 提交于 12月 19, 2020
```
github_2400

See merge request !69
```
  81830cd7
- github_2400 · 63c1f9a5
  由 Miykael_xxm 提交于 12月 19, 2020
  
  63c1f9a5
- Merge branch 'github_2300' into 'master' · 91b02c46
  由 Miykael_xxm 提交于 12月 19, 2020
```
github_2300

See merge request codechina/mirrors-settings!68
```
  91b02c46

拥抱太阳的月亮405 / 开源项目 与 Fork 源项目一致

拥抱太阳的月亮405 / 开源项目
与 Fork 源项目一致