Commit Graph

1800 Commits

Author SHA1 Message Date
04e392bddb Merge pull request #24847 from CN-YUANYU/dura
dura项目补充
2019-04-01 19:44:03 +08:00
c3e3674822 dura项目补充 2019-04-01 19:41:28 +08:00
276b95246f Merge pull request #24845 from bofeiw/blacklist
[fix] blacklist.md 城市名称跨行显示
2019-04-01 19:41:12 +08:00
37563750a2 Merge pull request #24846 from cookieY/master
新增支持开源项目
2019-04-01 19:40:27 +08:00
6f5e78ef60 Merge pull request #24843 from bofeiw/readme
Update README.md
2019-04-01 19:39:00 +08:00
fca5bc435e 新增支持项目
新增支持项目Yearning 声援996.icu
2019-04-01 19:31:31 +08:00
42b9c4f187 Update blacklist.md 2019-04-01 22:09:06 +11:00
5c73201705 [Chore]update awesomelist 2019-04-01 19:01:20 +08:00
f25ff4fb04 Update README.md 2019-04-01 21:51:32 +11:00
78801289e2 Merge pull request #24839 from qmdx/master
add mybatis.plus
2019-04-01 18:32:27 +08:00
89a0a59a9b Merge branch 'master' into master 2019-04-01 18:32:16 +08:00
31740e77b3 Merge pull request #24838 from infinnie/patch-1
Update projects.md
2019-04-01 18:30:50 +08:00
41054643c1 Merge pull request #24836 from wildfirechat/master
野火IM解决方案支持996ICU License
2019-04-01 18:30:32 +08:00
56f0ccd085 Merge branch 'master' into master 2019-04-01 18:30:16 +08:00
a24ba74f1b Merge pull request #24835 from NingZelin/master
Update projects.md
2019-04-01 18:29:38 +08:00
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