Skip to content

Commit 5394600

Browse files
committed
合并冲突
2 parents 1fe14ae + 50ed52b commit 5394600

File tree

10 files changed

+217
-375
lines changed

10 files changed

+217
-375
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,5 @@ qqwry.dat
113113
*.yaml
114114
plugins/
115115
static/
116-
/gb
116+
/gb
117+
/cert/

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/becivells/goblin)
99
Goblin 是一款适用于红蓝对抗的钓鱼演练工具。通过反向代理,可以在不影响用户操作的情况下无感知的获取用户的信息,或者诱导用户操作。也可以通过使用代理方式达到隐藏服务端的目的。内置插件,通过简单的配置,快速调整网页内容以达到更好的演练效果
1010

11-
[:ledger:English Document](https://github.com/xiecat/goblin/blob/master/README_EN.md) | [:pushpin:下载地址](https://github.com/xiecat/goblin/releases) | [:book:使用文档](https://goblin.xiecat.fun/)
11+
[:ledger:English README](https://github.com/xiecat/goblin/blob/master/README_EN.md) | [:pushpin:下载地址](https://github.com/xiecat/goblin/releases) | [:book:使用文档](https://goblin.xiecat.fun/)
1212

1313
## :collision: 特点:
1414

@@ -154,7 +154,7 @@ js 注入有两种方式一种是跟着页面走(Replace 需要自己追加` \<s
154154

155155
### [Flash 钓鱼案例](https://goblin.xiecat.fun/example/flash.html)
156156

157-
更多案例请加微信群询问。或者提 issus 酌情增删
157+
更多案例请加微信群询问。或者提 issue 酌情增删
158158

159159

160160
## :bar_chart: Todo

0 commit comments

Comments
 (0)