Commit Graph

2671 Commits

Author SHA1 Message Date
ae40e069e2 Merge pull request #25752 from yangxianhao/master
update blacklist
2019-04-25 09:41:42 +08:00
7f21e30c45 Merge pull request #25750 from ChongqingWangYu/master
添加反996协议项目
2019-04-25 09:40:55 +08:00
b1bdd693bf Merge branch 'master' into master 2019-04-25 09:40:46 +08:00
16f2e028e8 Merge pull request #25749 from Abjust/patch-1
Update fr_FR.md
2019-04-25 09:40:02 +08:00
5e63ad9b98 Merge pull request #25748 from Winter-Is-Comming-Soon/master
Update blacklist readme
2019-04-25 09:39:42 +08:00
7428ee0493 Merge pull request #25747 from flyaways/patch-1
增加Anti 996项目github.com/flyaways/pool:golang通用连接池,支持:GRPC,RPC,TCP
2019-04-25 09:39:31 +08:00
40b8a9d926 Merge branch 'master' into patch-1 2019-04-25 09:39:23 +08:00
73c97a0988 Merge pull request #25746 from Jeff-Tian/master
添加 gRPC man 项目地址 已添加 反996 License
2019-04-25 09:38:32 +08:00
894faa0d48 Merge branch 'master' into master 2019-04-25 09:38:26 +08:00
71116742df Merge pull request #25745 from SamRidings/master
Update news_EN.md
2019-04-25 09:37:47 +08:00
4a3a1b5e0a Merge branch 'master' into master 2019-04-25 09:37:08 +08:00
f881905a98 Merge pull request #25744 from Battery233/patch-1
Update ANTI-996 DAY.MD
2019-04-25 09:36:17 +08:00
fd64aa1691 Merge pull request #25743 from sujinlee0616/master
Update Korean translation
2019-04-25 09:35:35 +08:00
49389e80b3 Merge pull request #25742 from memadaA/local
update blacklist README
2019-04-25 09:35:06 +08:00
1d431c1f6c Merge branch 'master' into local 2019-04-25 09:34:57 +08:00
f484993e40 Merge pull request #25741 from AnBera/master
updated external link details.
2019-04-25 09:31:16 +08:00
aa85f51ffe Merge pull request #25740 from wintonBy/patch-4
Update remotelist.md
2019-04-25 09:30:52 +08:00
d01719de8f Merge pull request #25739 from yeasreal/master
自制的短视频
2019-04-25 09:30:27 +08:00
6c8b873030 Merge pull request #25738 from 1234adbc/patch-2
Update README.md
2019-04-25 09:29:38 +08:00
ea80e110b4 Merge pull request #25737 from sauihdik/patch-2
rewrite Finnish translation
2019-04-25 09:29:06 +08:00
5b16be291f Merge pull request #25736 from liujiajun/master
Fix grammar errors
2019-04-25 09:28:54 +08:00
f130f213ba Merge pull request #25735 from Red-Error404/patch-3
Update README.md
2019-04-25 09:28:17 +08:00
a351cef29f update blacklist 2019-04-24 17:21:33 +08:00
0ca1429147 更改排版 2019-04-23 21:26:04 -07:00
8db66d32bd 增加法律依据
所有法律依据已经翻译成法语,并进行了校对,同时小幅更改了页面结构。
2019-04-23 21:18:14 -07:00
390fd799dd Update README.md 2019-04-24 11:56:32 +08:00
d9c2e07a52 Update README.md 2019-04-24 11:53:59 +08:00
201df92d54 Update README.md 2019-04-24 11:53:34 +08:00
978bfea779 Update README.md 2019-04-24 11:51:41 +08:00
83472aa0fb Update README.md 2019-04-24 11:49:52 +08:00
d359f65274 Update fr_FR.md 2019-04-23 20:42:48 -07:00
1236dd80ca Update fr_FR.md
添加法律依据,法律依据已翻译成法语并进行过校对。
2019-04-23 20:41:54 -07:00
7e2a20835b Update blacklist readme 2019-04-24 11:20:59 +08:00
8521ea182c Update README.md 2019-04-24 10:41:29 +08:00
a565a42716 添加 gRPC man 项目地址 已添加 反996 License 2019-04-24 10:19:09 +08:00
2b8db1b617 Update news_EN.md 2019-04-23 23:19:19 +01:00
a20b1411a7 Update ANTI-996 DAY.MD 2019-04-23 19:30:20 +01:00
897e5f7175 Update ko_KR.md 2019-04-24 02:14:13 +09:00
1d97efdd17 Update ko_KR.md
Update ko_KR.md so it can be same as current version of README.md (https://github.com/996icu/996.ICU). 
Current one is totally different from  README.md.
Maybe the current one is a very old version. (It was modified 24 days ago)
2019-04-24 02:13:10 +09:00
35b475cfdb update blacklist 本人所在公司 2019-04-24 00:45:54 +08:00
3ae803a68d updated external link details.
~ Added Gizmodo link
2019-04-23 22:06:11 +05:30
8acf4aaacf Update remotelist.md
这个信息不对
2019-04-23 23:31:46 +08:00
c683da971b 增加相关视频 2019-04-23 22:53:36 +08:00
e9d3d7c83c 增加相关视频 2019-04-23 22:49:11 +08:00
38f76d9433 Update README.md
Update README.md
2019-04-23 22:18:46 +08:00
64d2b994b5 rewrite Finnish translation
The Finnish translation was previously largely machine-translated garbage.
2019-04-23 17:15:40 +03:00
0c5226ed87 Fix grammar errors 2019-04-23 21:18:43 +08:00
ac4b671692 Update README.md 2019-04-23 21:01:48 +08:00
12a368f792 Update README.md 2019-04-23 18:18:19 +08:00
89335de685 Update README.md 2019-04-23 18:16:51 +08:00