Commit Graph

2874 Commits

Author SHA1 Message Date
94ee1291ab Merge branch 'master' into fa_IR 2019-03-29 23:53:55 +04:30
3a66c71e60 Correct copy of italian version 2019-03-29 19:45:58 +01:00
9e7da14b5b Move assets path 2019-03-30 02:44:18 +08:00
88afc32015 Merge pull request #24653 from thomasgassmann/german-grammar
fix german grammar issues
2019-03-30 02:33:34 +08:00
71b6d9586e Merge pull request #24655 from bofeiw/master
增加印地语 让印度哥们也看看
2019-03-30 02:33:09 +08:00
8b3692bce5 Update README.md 2019-03-30 02:25:33 +08:00
b8afb42fdd Update README.md 2019-03-30 02:24:10 +08:00
6b3eddf323 Merge pull request #24662 from zombie110year/master
修改了 README 和 gen-license tool
2019-03-30 02:22:35 +08:00
7d04d97781 Merge branch 'master' into master 2019-03-30 02:21:33 +08:00
5e1c833621 Merge pull request #24654 from thomasgassmann/add-swiss-german-translation
add swiss german translation
2019-03-30 02:20:07 +08:00
4c7f0b3462 Merge pull request #24660 from RoynKo/patch-1
Fix grammar error
2019-03-30 02:19:17 +08:00
2a02bf9e79 Merge pull request #24661 from luan0ap/master
[FIX] - Word in english adjusted to pt_BR
2019-03-30 02:18:54 +08:00
f50d74e187 add origin 996ICU LICENSE v0.1 to tool 2019-03-30 02:14:44 +08:00
32d1bb70e9 Merge remote-tracking branch 'upstream/master' 2019-03-30 02:09:46 +08:00
8e3cd8218f follow master's change 2019-03-30 02:09:27 +08:00
4e7d8d10fe [FIX] - Word in english adjusted to pt_BR 2019-03-29 15:08:53 -03:00
ce88800584 Fix grammar error 2019-03-29 11:08:45 -07:00
35a033d456 Merge pull request #24645 from pokk/patch-1
Update making the last words bold
2019-03-30 02:08:30 +08:00
d7c076cd96 Merge pull request #24648 from euxx/patch-1
Fix a grammatical error in README.md
2019-03-30 02:07:04 +08:00
7fb16854ed Update README.md 2019-03-30 02:05:07 +08:00
03884485ac Merge pull request #24657 from xiaohuilam/patch-2
make license name international recognizable.
2019-03-30 02:04:15 +08:00
8003290649 move files for what master do 2019-03-30 02:03:42 +08:00
6baeeb54ed UPDATE README.md 2019-03-30 01:54:49 +08:00
39751cb4a1 UPDATE LICENSE 2019-03-30 01:51:50 +08:00
2b45f7904a update README.md: fix links 2019-03-30 01:50:03 +08:00
d07112e44f update gen-license version code 2019-03-30 01:46:25 +08:00
9c14ebdec8 README.md in licenses[WIP] to description 2019-03-30 01:45:06 +08:00
a2fcf908b4 add multi language support to gen-license 2019-03-30 01:43:47 +08:00
252fa9b7f3 Sync LICENSE template
between gen-license and licenses[WIP]
2019-03-30 01:37:37 +08:00
361cbb37b6 make license name international recognizable. 2019-03-30 01:28:22 +08:00
1445bb45c1 增加印地语 让印度哥们也看看 2019-03-30 04:21:09 +11:00
151b9f5761 Update LICENSE 2019-03-30 01:17:00 +08:00
e6bd8e9e89 add swiss german translation 2019-03-29 18:14:58 +01:00
e4ceea45d1 fix german grammar issues 2019-03-29 18:10:16 +01:00
0393e82934 Merge pull request #24650 from novaNova1/master
fix blacklist markdown table
2019-03-30 01:09:34 +08:00
7f35e484aa Merge pull request #24651 from DarknessChaser/master
链接在windows上打开错误
2019-03-30 01:02:31 +08:00
e6f4f701a4 Merge pull request #24652 from bofeiw/master
黑名单增加:阿里 字节跳动 苏宁
2019-03-30 01:01:56 +08:00
86fb793792 Merge pull request #24647 from imguozr/master
Add english translations of 996ICU License & Modify the chinese version.
2019-03-30 01:01:15 +08:00
7c4f970061 黑名单增加字节跳动,苏宁 2019-03-30 03:57:38 +11:00
efd290c181 黑名单添加阿里996 2019-03-30 03:52:33 +11:00
538cd17235 Update i18n.md
修改链接大小写
2019-03-30 00:48:03 +08:00
f3816a1c79 fix markdown table 2019-03-30 00:43:39 +08:00
68eecc4c60 Update README.md 2019-03-30 00:24:06 +08:00
87ac7a7e0d Merge pull request #24625 from maxoes/patch-1
Update de_DE.md
2019-03-30 00:16:12 +08:00
eux
64e6bb72c2 Update README.md
Fix a grammatical error in README.md
2019-03-30 00:12:08 +08:00
aa6aef4ecb Merge pull request #24632 from sjhddh/supporting_projects
在License文件夹下增加一个已支持996LINCESE的项目列表
2019-03-30 00:10:57 +08:00
a06eee606d Merge pull request #24644 from Xander-x/Xander-x-patch-1
Update blacklist.md
2019-03-30 00:09:53 +08:00
4e03748b99 Merge branch 'master' into Xander-x-patch-1 2019-03-30 00:08:33 +08:00
5b3558543b Merge remote-tracking branch '996icu/master' 2019-03-29 16:08:20 +00:00
62cd687203 Add english translations of 996ICU License.
& Modify the chinese version.
2019-03-30 00:06:15 +08:00