Commit Graph

2001 Commits

Author SHA1 Message Date
996icu
a0310fbc00 Merge branch 'master' into master 2019-04-03 19:16:49 +08:00
996icu
982f63e138 Merge pull request #25033 from zowiegong/update-readme
相关报道格式调整
2019-04-03 19:14:04 +08:00
996icu
dc60148cc3 Merge pull request #25036 from chenyixin8854/master
坚决抵制
2019-04-03 19:11:32 +08:00
996icu
c1e02475eb Merge pull request #25037 from ChanpleCai/patch-1
Update projects.md
2019-04-03 19:10:57 +08:00
996icu
28d2ffb2b0 Merge pull request #25038 from Franklxs/patch-1
Update whitelist.md
2019-04-03 19:10:29 +08:00
Franklxs
22bc2fa7b8 Update whitelist.md 2019-04-03 18:57:09 +08:00
Yahtnif
d8d4ff62e8 Update ata description 2019-04-03 18:48:57 +08:00
Yahtnif
6916d02406 Update ata description 2019-04-03 18:40:56 +08:00
Yahtnif
978aaf6775 Update foke description 2019-04-03 18:18:22 +08:00
Chanple
90ead489b3 Update projects.md
Add SmartTaskbar Project
2019-04-03 18:11:18 +08:00
chenxin5
e736f63b0f 坚决抵制 2019-04-03 17:50:17 +08:00
谢雄平
323884c8a9 Fix 2019-04-03 17:23:54 +08:00
waynegong
665686c471 update reademe 2019-04-03 17:20:42 +08:00
谢雄平
10ce8cfd58 Update projects.md 2019-04-03 17:17:49 +08:00
ileego
dda87558a6 Update README.md 2019-04-03 16:44:06 +08:00
ileego
e3401db691 Update README.md
南方日报:正视年轻人压力“爆棚”的危险
2019-04-03 16:40:16 +08:00
ileego
aabf8b3c8f Update README.md 2019-04-03 16:38:02 +08:00
ileego
e9ac5fbb6e Update README.md 2019-04-03 16:37:19 +08:00
ileego
63abda11cf Update README.md
南方日报:正视年轻人压力“爆棚”的危险
2019-04-03 16:36:04 +08:00
Ruikoto
bb5b9a3da7 Update blacklist.md
修复“北京关键科技股份有限公司”处的"图片-1"指向错误
2019-04-03 16:23:54 +08:00
b375a4a21f fix all license name to <anti 996 license> 2019-04-03 16:13:41 +08:00
cce85b5013 fix readme 2019-04-03 16:09:18 +08:00
Changeden
7bc99620a2 合并内容 2019-04-03 16:02:53 +08:00
Julyme
68a96a68b4 Adding my project to "awesomelist"
Adding my project to "awesomelist"
2019-04-03 15:59:12 +08:00
e613dcfef3 <996 License> is misleading, it should be <Anti 996 License> 2019-04-03 15:54:17 +08:00
ctj1731
1f68410772 Update blacklist.md
修复 北京关键科技股份有限公司 图片1地址错误
2019-04-03 15:43:24 +08:00
liuxiaoshuai
39ab41e831 no message 2019-04-03 15:18:19 +08:00
Yahtnif
6cf8f9062d Add logo 2019-04-03 15:16:56 +08:00
liuxiaoshuai
990150f107 no message 2019-04-03 15:16:48 +08:00
liuxiaoshuai
5537385ee5 no message 2019-04-03 15:13:01 +08:00
Force Charlie
3352d176e3 [awesomelist] Add Privexec Clangbuilder NSudo 2019-04-03 15:05:37 +08:00
feiy
1a6bb90df8 Adding ThrustRTC to "awesomelist" 2019-04-03 14:33:54 +08:00
isVertical
450abf0d8c Update projects.md 2019-04-03 14:33:10 +08:00
RyanX
f2a3d122e0 remove space 2019-04-03 14:26:08 +08:00
Changeden
231ca73c18 Merge remote-tracking branch 'upstream/master' into local 2019-04-03 14:23:08 +08:00
Changeden
40942e2960 添加相关报道 2019-04-03 14:22:54 +08:00
Changeden
33f993f7f7 添加相关报道 2019-04-03 14:22:26 +08:00
Neil Pei
dec26c0c05 set up related reports part 2019-04-03 14:13:52 +08:00
996icu
8387b48216 Merge pull request #25009 from PsChina/master
增加空格
2019-04-03 14:12:26 +08:00
996icu
53917079d8 Update README.md 2019-04-03 14:11:41 +08:00
Changeden
2e40067d0b Merge remote-tracking branch 'upstream/master' into local 2019-04-03 14:11:15 +08:00
Neil Pei
26e7ba7c0d Merge branch 'master' of https://github.com/epicGeek/996.ICU 2019-04-03 14:09:53 +08:00
996icu
b3cc6e1143 Merge pull request #24996 from victor647/patch-3
Delete youzu.png
2019-04-03 14:09:25 +08:00
996icu
46aad32df1 Merge pull request #24995 from victor647/patch-2
Update blacklist.md
2019-04-03 14:09:14 +08:00
Neil Pei
5436d133fb fix link error 2019-04-03 14:08:49 +08:00
996icu
e905419d47 Merge pull request #24991 from xixifeng/patch-1
Add project under 996ICU License
2019-04-03 14:08:19 +08:00
996icu
57029d6d5d Merge pull request #24992 from FrankP1026/master
Remove a sentence in en_US that does not exist in zh_CN
2019-04-03 14:07:53 +08:00
Changeden
3bd3ae279d Merge remote-tracking branch 'upstream/master' into local 2019-04-03 14:05:11 +08:00
996icu
0b44e5a733 Merge pull request #24999 from NingZelin/patch-1
Update projects.md
2019-04-03 14:04:51 +08:00
shanshan
63b2ceb5ba 增加空格 2019-04-03 14:03:46 +08:00