Commit Graph

1373 Commits

Author SHA1 Message Date
78cb3bfe10 Merge branch 'master' into master 2019-04-01 18:29:23 +08:00
270d5bd5fa Update README.md 2019-04-01 18:28:11 +08:00
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
12905d1e5b Update projects.md 2019-04-01 18:18:11 +08:00
38befd7b50 Update projects.md 2019-04-01 18:17:14 +08:00
382ed86593 Update projects.md 2019-04-01 18:15:17 +08:00
7fc3eba504 Update projects.md
此项目已增加 996 License
2019-04-01 18:05:23 +08:00
6fd0a70cf0 野火IM解决方案支持996ICU License 2019-04-01 18:03:27 +08:00
e70edd7351 delete 'draft', now 1.0 is ready 2019-04-01 17:59:08 +08:00
e3e6cebfa2 Merge branch 'master' into master 2019-04-01 17:52:49 +08:00
aae76ff182 Merge pull request #24830 from kakalote2008/master
add 蚂蚁金服
2019-04-01 17:45:51 +08:00
4d70534af2 Solve conflict 2019-04-01 17:45:40 +08:00
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
cf7284c97b Merge remote-tracking branch 'upstream/master' into local 2019-04-01 17:21:51 +08:00
11c7c6166a 加入更多996协议项目 2019-04-01 17:21:19 +08:00
c8b5afc578 add 蚂蚁 2019-04-01 17:20:45 +08:00
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
51503d5d41 Rename the License as Anti 996 License 2019-04-01 17:18:54 +08:00
659fe5f53e Update README.md 2019-04-01 17:17:58 +08:00
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
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
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