Commit Graph

913 Commits

Author SHA1 Message Date
996icu
a24ba74f1b Merge pull request #24835 from NingZelin/master
Update projects.md
2019-04-01 18:29:38 +08:00
996icu
78cb3bfe10 Merge branch 'master' into master 2019-04-01 18:29:23 +08:00
996icu
270d5bd5fa Update README.md 2019-04-01 18:28:11 +08:00
996icu
a2dd40d3eb Merge pull request #24834 from kattgu7/master
Add the New Chinese License and few other name change
2019-04-01 18:23:11 +08:00
NingZelin
7fc3eba504 Update projects.md
此项目已增加 996 License
2019-04-01 18:05:23 +08:00
Suji Yan
e70edd7351 delete 'draft', now 1.0 is ready 2019-04-01 17:59:08 +08:00
Suji Yan
e3e6cebfa2 Merge branch 'master' into master 2019-04-01 17:52:49 +08:00
996icu
aae76ff182 Merge pull request #24830 from kakalote2008/master
add 蚂蚁金服
2019-04-01 17:45:51 +08:00
sujiyan
4d70534af2 Solve conflict 2019-04-01 17:45:40 +08:00
996icu
32283f181a Merge pull request #24832 from Leslin/master
Update projects.md
2019-04-01 17:45:09 +08:00
大林
ab31c21ea0 Update projects.md
add Projects
2019-04-01 17:33:07 +08:00
清穹
c8b5afc578 add 蚂蚁 2019-04-01 17:20:45 +08:00
996icu
bf94e20176 Merge pull request #24829 from ChangedenCZD/local
加入更多996协议项目
2019-04-01 17:20:37 +08:00
清穹
e7d8024a77 add 蚂蚁 2019-04-01 17:19:15 +08:00
Katt Gu
51503d5d41 Rename the License as Anti 996 License 2019-04-01 17:18:54 +08:00
Katt Gu
659fe5f53e Update README.md 2019-04-01 17:17:58 +08:00
Changeden
e2ac6abc5c 加入更多996协议项目 2019-04-01 17:17:19 +08:00
Katt Gu
543143a9b1 Update LICENSE 2019-04-01 17:17:03 +08:00
Katt Gu
c43dc06be0 Create LICENSE_CN 2019-04-01 17:15:32 +08:00
996icu
706e96353e Update README.md 2019-04-01 17:14:50 +08:00
996icu
b92ffe0828 Merge pull request #24828 from ChangedenCZD/local
Update blacklist.md
2019-04-01 17:13:35 +08:00
Changeden
f12bf4b884 Merge remote-tracking branch 'upstream/master' into local 2019-04-01 17:12:06 +08:00
996icu
b11c84b13f Update README.md 2019-04-01 17:07:45 +08:00
996icu
1f6f62e93a Update README.md 2019-04-01 17:07:19 +08:00
996icu
751ede619c Update README.md 2019-04-01 17:06:54 +08:00
996icu
329ba9018d Create projects.md 2019-04-01 17:06:42 +08:00
Katt Gu
ff96c563b8 Merge pull request #1 from 996icu/master
update
2019-04-01 17:04:14 +08:00
Changeden
9189305d16 之前的资料被merge时弄走了 2019-04-01 16:49:13 +08:00
Changeden
f9f97bfe4b 之前的资料被merge时弄走了 2019-04-01 16:46:25 +08:00
996icu
e41b34c995 Merge pull request #24827 from MMzhe/patch-1
Update README.md
2019-04-01 16:44:41 +08:00
996icu
466b362dc5 Merge pull request #24826 from LETS-ALL-IN/ths
Update blacklist
2019-04-01 16:43:26 +08:00
996icu
083ea023be Merge branch 'master' into ths 2019-04-01 16:43:11 +08:00
996icu
3100e12428 Merge pull request #24815 from ChangedenCZD/local
Update blacklist.rm file
2019-04-01 16:39:40 +08:00
sourcema
1cc201cdf6 Update README.md
移除无效链接
2019-04-01 16:36:57 +08:00
Changeden
5907997a1a Merge remote-tracking branch 'upstream/master' into local 2019-04-01 16:34:40 +08:00
996icu
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
Changeden
172836c23e Merge remote-tracking branch 'upstream/master' into local 2019-04-01 16:31:37 +08:00
LETS-ALL-IN
fca79db767 Update blacklist 2019-04-01 16:30:54 +08:00
996icu
e34388abef Merge pull request #24820 from mzzx/master
Update de_DE.md
2019-04-01 16:29:45 +08:00
ChangedenChan
dc0fde16a3 Merge branch 'master' into local 2019-04-01 16:27:10 +08:00
996icu
5d83dbf9bd Merge pull request #24816 from lujiang-wed/master
add 965 whitelist company
2019-04-01 16:27:06 +08:00
996icu
12cdf37d51 Merge pull request #24812 from cv23c/master
Update balcklist.md
2019-04-01 16:25:27 +08:00
996icu
c3d3529843 Merge branch 'master' into master 2019-04-01 16:25:14 +08:00
996icu
9fc5807eab Merge pull request #24809 from dkunlun/patch-1
add company
2019-04-01 16:24:32 +08:00
996icu
918d54dd07 Merge branch 'master' into patch-1 2019-04-01 16:24:20 +08:00
996icu
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
Changeden
0334076523 Merge remote-tracking branch 'origin/local' into local 2019-04-01 16:21:08 +08:00
Changeden
e0937de8a2 合并跟多资料 2019-04-01 16:20:45 +08:00
996icu
fa8caabee3 Merge pull request #24804 from phillennium/patch-2
Fixed typos and worked on stylistics
2019-04-01 16:20:44 +08:00
996icu
76ef3b8c1f Merge pull request #24805 from Sampan-Lee/patch-4
Update blacklist.md
2019-04-01 16:19:42 +08:00