Commit Graph

2428 Commits

Author SHA1 Message Date
d5583cb192 Merge pull request #25502 from dhcn/master
Update README.md
2019-04-13 16:21:16 +08:00
0482dff987 Merge pull request #25511 from maillengxue/patch-2
Update README.md
2019-04-13 16:20:18 +08:00
70ac43e566 Merge pull request #25519 from stupdit1t/master
Removal of sensitive information
2019-04-13 16:19:36 +08:00
94d0abead7 Merge pull request #25520 from toshihidetagami/toshihidetagami-patch-1
minor fix to Japanese translation
2019-04-13 16:19:03 +08:00
37fea9797e minor fix to Japanese translation 2019-04-13 16:09:19 +08:00
a7fbf47c07 Update README.md 2019-04-13 15:56:46 +08:00
d8cf0877ce Update README.md
The author has come back, thank you for merging just now. But it was too hasty just now, this pr is to disguise thanks!
2019-04-13 15:53:30 +08:00
d49df5645c Merge pull request #25496 from oudoubleyang/patch-1
Update README.md with warning in Chinese readme
2019-04-13 15:42:58 +08:00
0ffccd0a33 Merge pull request #25501 from gotobeta/jackma
增加《马云谈996》和知乎的网友热议
2019-04-13 15:41:45 +08:00
6bb5505099 Merge pull request #25504 from BadTeachersICU/master
新增刘强东的996言论:地板闹钟的故事
2019-04-13 15:41:23 +08:00
629b7a8eff Merge pull request #25512 from swwl1992/master
add news in EN on 12 April
2019-04-13 15:40:53 +08:00
213cdd1295 Merge pull request #25490 from githubmll/patch-3
Path error 404
2019-04-13 15:40:20 +08:00
be9b1ee1a7 Merge pull request #25505 from xianfengting/patch-1
修改简体中文md文件中的繁体字为简体字
2019-04-13 15:39:48 +08:00
070007c677 Merge pull request #25486 from xianfengting/patch-0
修改项目AndroidAnti996Browser的License徽章
2019-04-13 15:39:18 +08:00
34c32a13e8 Merge pull request #25494 from feng-shan/patch-4
add news
2019-04-13 15:38:53 +08:00
4ac1c61ad5 Merge pull request #25497 from njzjz/imgbot
[ImgBot] Optimize images
2019-04-13 15:38:27 +08:00
f2491150c8 Merge pull request #25498 from itning/master
Add Hit Count Number of people
2019-04-13 15:38:09 +08:00
6cc09bd46b Merge pull request #25513 from stupdit1t/master
Remove sensitive information
2019-04-13 15:37:21 +08:00
c03a4d0b36 Merge pull request #25507 from xianfengting/patch-2
在README.md(英文版README)中添加996.YAOCL链接并对链接顺序进行排序
2019-04-13 15:34:09 +08:00
8d6e949217 Merge pull request #25489 from githubmll/patch-2
内容翻译路径错误,访问404
2019-04-13 15:30:12 +08:00
24d63f11f4 Update README.md 2019-04-13 15:27:06 +08:00
89c77abbe6 上海邻趣995 2019-04-13 15:25:25 +08:00
39de5136c9 Update README.md 2019-04-13 15:18:19 +08:00
48b197b553 Update README.md 2019-04-13 15:17:14 +08:00
55f898a27c Update README.md 2019-04-13 15:15:31 +08:00
8e5687cb0b Update README.md 2019-04-13 15:11:26 +08:00
9f4e1444a9 zttjt 2019-04-13 15:11:11 +08:00
c5a0ffcb03 Update README.md 2019-04-13 15:09:25 +08:00
6801aef906 Update README.md 2019-04-13 13:26:53 +08:00
99a71cf398 delete keyware
delete keyware
2019-04-13 13:22:39 +08:00
df40bff495 delete keyware
delete keyware
2019-04-13 13:22:15 +08:00
12d74f25fe add news in EN on 12 April 2019-04-13 13:05:22 +08:00
30b4f10175 Update README.md
马云:后悔忙于工作 没时间陪家人 有来生绝不这样;
马云:996是修来的福报!
2019-04-13 12:49:34 +08:00
63b88206bb Add the 996.YAOCL link and sorted by the README_CN.md file. 2019-04-13 12:11:58 +08:00
5ede0a2d97 Modify zh-lzh-Hans.md 2019-04-13 11:28:13 +08:00
77ed1c2caf 新增刘强东的996言论:地板闹钟的故事 2019-04-13 11:21:58 +08:00
79fc622610 Merge branch 'master' of github.com:xianfengting/996.ICU 2019-04-13 11:20:20 +08:00
50323d43fd Update README.md 2019-04-13 10:59:48 +08:00
fc4664f9ae 增加《马云谈996》和知乎的网友热议 2019-04-13 10:33:06 +08:00
b96d5ef75b Add Hit Count 2019-04-13 09:10:17 +08:00
624d2310e5 Add Hit Count 2019-04-13 09:09:40 +08:00
77c028a84a Update README.md with warning in Chinese readme
加入了中文说明的警示
2019-04-13 01:36:15 +08:00
b37c84f8bc add news
添加近期《半月谈》(党刊)、《经济日报》与《钱江晚报》对996的报导
2019-04-13 00:47:08 +08:00
4f4db657b9 Update README.md 2019-04-12 23:52:26 +08:00
50835c81df Merge branch 'master' into blacklist 2019-04-12 23:44:11 +08:00
77cf46959b revert "黑名单添加 中科曙光" 2019-04-12 23:39:38 +08:00
3955df7b39 Add files via upload 2019-04-12 23:34:44 +08:00
84885cb58b Update README.md 2019-04-12 23:33:40 +08:00
0db1d60670 Add files via upload 2019-04-12 23:18:30 +08:00
b08bb5467b Path error 404
Path error 404
2019-04-12 23:08:03 +08:00