Commit Graph

1483 Commits

Author SHA1 Message Date
323884c8a9 Fix 2019-04-03 17:23:54 +08:00
665686c471 update reademe 2019-04-03 17:20:42 +08:00
10ce8cfd58 Update projects.md 2019-04-03 17:17:49 +08:00
dda87558a6 Update README.md 2019-04-03 16:44:06 +08:00
e3401db691 Update README.md
南方日报:正视年轻人压力“爆棚”的危险
2019-04-03 16:40:16 +08:00
aabf8b3c8f Update README.md 2019-04-03 16:38:02 +08:00
e9ac5fbb6e Update README.md 2019-04-03 16:37:19 +08:00
63abda11cf Update README.md
南方日报:正视年轻人压力“爆棚”的危险
2019-04-03 16:36:04 +08:00
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
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
1f68410772 Update blacklist.md
修复 北京关键科技股份有限公司 图片1地址错误
2019-04-03 15:43:24 +08:00
39ab41e831 no message 2019-04-03 15:18:19 +08:00
6cf8f9062d Add logo 2019-04-03 15:16:56 +08:00
990150f107 no message 2019-04-03 15:16:48 +08:00
5537385ee5 no message 2019-04-03 15:13:01 +08:00
3352d176e3 [awesomelist] Add Privexec Clangbuilder NSudo 2019-04-03 15:05:37 +08:00
1a6bb90df8 Adding ThrustRTC to "awesomelist" 2019-04-03 14:33:54 +08:00
450abf0d8c Update projects.md 2019-04-03 14:33:10 +08:00
f2a3d122e0 remove space 2019-04-03 14:26:08 +08:00
231ca73c18 Merge remote-tracking branch 'upstream/master' into local 2019-04-03 14:23:08 +08:00
40942e2960 添加相关报道 2019-04-03 14:22:54 +08:00
33f993f7f7 添加相关报道 2019-04-03 14:22:26 +08:00
dec26c0c05 set up related reports part 2019-04-03 14:13:52 +08:00
8387b48216 Merge pull request #25009 from PsChina/master
增加空格
2019-04-03 14:12:26 +08:00
53917079d8 Update README.md 2019-04-03 14:11:41 +08:00
2e40067d0b Merge remote-tracking branch 'upstream/master' into local 2019-04-03 14:11:15 +08:00
26e7ba7c0d Merge branch 'master' of https://github.com/epicGeek/996.ICU 2019-04-03 14:09:53 +08:00
b3cc6e1143 Merge pull request #24996 from victor647/patch-3
Delete youzu.png
2019-04-03 14:09:25 +08:00
46aad32df1 Merge pull request #24995 from victor647/patch-2
Update blacklist.md
2019-04-03 14:09:14 +08:00
5436d133fb fix link error 2019-04-03 14:08:49 +08:00
e905419d47 Merge pull request #24991 from xixifeng/patch-1
Add project under 996ICU License
2019-04-03 14:08:19 +08:00
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
3bd3ae279d Merge remote-tracking branch 'upstream/master' into local 2019-04-03 14:05:11 +08:00
0b44e5a733 Merge pull request #24999 from NingZelin/patch-1
Update projects.md
2019-04-03 14:04:51 +08:00
63b2ceb5ba 增加空格 2019-04-03 14:03:46 +08:00
574d97717e Merge remote-tracking branch 'upstream/master' into local 2019-04-03 14:03:33 +08:00
e7fd73af34 Merge pull request #25002 from feng88724/patch-1
Update blacklist.md
2019-04-03 14:03:20 +08:00
5767476fbf Merge branch 'master' into local 2019-04-03 14:02:50 +08:00
6c183af486 Merge pull request #4 from 996icu/master
updata
2019-04-03 14:02:48 +08:00
ffdd1c31dc 合并内容 2019-04-03 14:01:33 +08:00
ac61192f21 Merge pull request #25006 from epicGeek/master
Split the origin README to Chinese and English README versions to make it easy to read and manage.
2019-04-03 13:58:58 +08:00
af31259201 Merge branch 'master' into master 2019-04-03 13:58:48 +08:00
2c2526a58a Merge pull request #25005 from TheMasterOfMagic/master
在README.md中添加共青团中央公众号相关报道
2019-04-03 13:56:55 +08:00
13de4ebd55 Merge branch 'master' into master 2019-04-03 13:42:27 +08:00
f84e4d9fe3 delete wrong part. 2019-04-03 13:36:51 +08:00
df21d95914 Merge branch 'master' into patch-1 2019-04-03 13:36:44 +08:00
7c98b5790f 在README.md中添加共青团中央公众号相关报道 2019-04-03 13:36:33 +08:00