Commit Graph

1918 Commits

Author SHA1 Message Date
e2ac6abc5c 加入更多996协议项目 2019-04-01 17:17:19 +08:00
543143a9b1 Update LICENSE 2019-04-01 17:17:03 +08:00
c43dc06be0 Create LICENSE_CN 2019-04-01 17:15:32 +08:00
706e96353e Update README.md 2019-04-01 17:14:50 +08:00
b92ffe0828 Merge pull request #24828 from ChangedenCZD/local
Update blacklist.md
2019-04-01 17:13:35 +08:00
f12bf4b884 Merge remote-tracking branch 'upstream/master' into local 2019-04-01 17:12:06 +08:00
b11c84b13f Update README.md 2019-04-01 17:07:45 +08:00
1f6f62e93a Update README.md 2019-04-01 17:07:19 +08:00
751ede619c Update README.md 2019-04-01 17:06:54 +08:00
329ba9018d Create projects.md 2019-04-01 17:06:42 +08:00
ff96c563b8 Merge pull request #1 from 996icu/master
update
2019-04-01 17:04:14 +08:00
9189305d16 之前的资料被merge时弄走了 2019-04-01 16:49:13 +08:00
f9f97bfe4b 之前的资料被merge时弄走了 2019-04-01 16:46:25 +08:00
e41b34c995 Merge pull request #24827 from MMzhe/patch-1
Update README.md
2019-04-01 16:44:41 +08:00
9b4c41c121 Merge remote-tracking branch 'upstream/master' 2019-04-01 16:43:56 +08:00
466b362dc5 Merge pull request #24826 from LETS-ALL-IN/ths
Update blacklist
2019-04-01 16:43:26 +08:00
083ea023be Merge branch 'master' into ths 2019-04-01 16:43:11 +08:00
97ca3b1a27 Merge remote-tracking branch 'remotes/upstream/master' 2019-04-01 16:43:05 +08:00
d5235d7350 处理冲突 2019-04-01 16:39:50 +08:00
3100e12428 Merge pull request #24815 from ChangedenCZD/local
Update blacklist.rm file
2019-04-01 16:39:40 +08:00
1cc201cdf6 Update README.md
移除无效链接
2019-04-01 16:36:57 +08:00
5907997a1a Merge remote-tracking branch 'upstream/master' into local 2019-04-01 16:34:40 +08:00
3afa669a30 Merge pull request #24825 from ff4415/master
Proposal_To_Request_GitHub_Official_Including_996ICU_License  |   发起提案,向GitHub 官方提出请求收录996ICU LICENSE
2019-04-01 16:32:05 +08:00
172836c23e Merge remote-tracking branch 'upstream/master' into local 2019-04-01 16:31:37 +08:00
fca79db767 Update blacklist 2019-04-01 16:30:54 +08:00
e34388abef Merge pull request #24820 from mzzx/master
Update de_DE.md
2019-04-01 16:29:45 +08:00
dc0fde16a3 Merge branch 'master' into local 2019-04-01 16:27:10 +08:00
5d83dbf9bd Merge pull request #24816 from lujiang-wed/master
add 965 whitelist company
2019-04-01 16:27:06 +08:00
12cdf37d51 Merge pull request #24812 from cv23c/master
Update balcklist.md
2019-04-01 16:25:27 +08:00
c3d3529843 Merge branch 'master' into master 2019-04-01 16:25:14 +08:00
9fc5807eab Merge pull request #24809 from dkunlun/patch-1
add company
2019-04-01 16:24:32 +08:00
918d54dd07 Merge branch 'master' into patch-1 2019-04-01 16:24:20 +08:00
5ffd8a85de Merge pull request #24803 from pokk/patch-3
Add the space between words and a number
2019-04-01 16:21:17 +08:00
0334076523 Merge remote-tracking branch 'origin/local' into local 2019-04-01 16:21:08 +08:00
e0937de8a2 合并跟多资料 2019-04-01 16:20:45 +08:00
fa8caabee3 Merge pull request #24804 from phillennium/patch-2
Fixed typos and worked on stylistics
2019-04-01 16:20:44 +08:00
76ef3b8c1f Merge pull request #24805 from Sampan-Lee/patch-4
Update blacklist.md
2019-04-01 16:19:42 +08:00
80d3b70c65 合并跟多资料 2019-04-01 16:19:35 +08:00
4687a39330 Merge branch 'master' into patch-4 2019-04-01 16:19:22 +08:00
dab39377c5 Merge branch 'master' into local 2019-04-01 16:17:57 +08:00
403642e5a1 add proposal_To_Request_Github_Official_Including_996ICU_License 2019-04-01 16:17:45 +08:00
a5e101c0b2 Merge pull request #24807 from heliang-whut/master
adjust order of some sentences for more coordination.
2019-04-01 16:17:13 +08:00
64389872c2 Merge branch 'master' into master 2019-04-01 16:17:03 +08:00
458b6aae5f Merge pull request #24810 from jieck/jieck996pr
blacklist/blacklist.md
2019-04-01 16:14:53 +08:00
84e09b7891 Merge pull request #24813 from djokovicwang/master
Update en_US.md
2019-04-01 16:14:10 +08:00
e4a6475926 Merge pull request #24817 from tinytian/patch-1
Update README.md
2019-04-01 15:58:59 +08:00
6b25c37e55 Update de_DE.md 2019-04-01 15:15:12 +08:00
f63654f186 Update README.md 2019-04-01 12:55:01 +08:00
f24d784936 Update en_US.md
Add a space before punctuation
it is reported -> it was reported
Youzan -> Youzan.com
Highlight stock code
2019-04-01 11:58:36 +08:00
48a45e499f 加入更多黑名单(github链接) 2019-04-01 11:30:18 +08:00