Merge branch 'main' of https://git.masonliu.com/MasonLiu/home
This commit is contained in:
commit
bcf3fa867c
25
index.html
25
index.html
@ -65,7 +65,14 @@
|
|||||||
<a href="https://nav.masonliu.com" class="blog-button" target="_blank">导 航</a>
|
<a href="https://nav.masonliu.com" class="blog-button" target="_blank">导 航</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="navigation__item">
|
<li class="navigation__item">
|
||||||
|
<<<<<<< HEAD
|
||||||
<a href="https://www.masonliu.org" class="blog-button" target="_blank">新导航</a>
|
<a href="https://www.masonliu.org" class="blog-button" target="_blank">新导航</a>
|
||||||
|
=======
|
||||||
|
<a href="https://work.masonliu.com/" class="blog-button" target="_blank">项目管理平台</a>
|
||||||
|
</li>
|
||||||
|
<li class="navigation__item">
|
||||||
|
<a href="https://mail.masonliu.com" class="blog-button" target="_blank">邮箱</a>
|
||||||
|
>>>>>>> 9072724cb39e1886486b20dc74bd2a78ee1b92d6
|
||||||
</li>
|
</li>
|
||||||
<li class="navigation__item">
|
<li class="navigation__item">
|
||||||
<a href="https://work.masonliu.com/" class="blog-button" target="_blank">项目管理</a>
|
<a href="https://work.masonliu.com/" class="blog-button" target="_blank">项目管理</a>
|
||||||
@ -80,8 +87,26 @@
|
|||||||
<a href="https://git.masonliu.com/" class="blog-button" target="_blank">Gitea</a>
|
<a href="https://git.masonliu.com/" class="blog-button" target="_blank">Gitea</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="navigation__item">
|
<li class="navigation__item">
|
||||||
|
<<<<<<< HEAD
|
||||||
<a href="https://info.masonliu.com" class="blog-button" target="_blank">安全资讯</a>
|
<a href="https://info.masonliu.com" class="blog-button" target="_blank">安全资讯</a>
|
||||||
</li>
|
</li>
|
||||||
|
=======
|
||||||
|
<a href="https://docsys.masonliu.com/DocSystem" class="blog-button" target="_blank">Docsys</a>
|
||||||
|
</li>
|
||||||
|
<br>
|
||||||
|
<!-- <li class="navigation__item">
|
||||||
|
<a href="https://monitor.masonliu.com" class="blog-button" target="_blank">Zabbix</a>
|
||||||
|
</li> -->
|
||||||
|
<li class="navigation__item">
|
||||||
|
<a href="https://info.masonliu.com" class="blog-button" target="_blank">安全资讯</a>
|
||||||
|
</li>
|
||||||
|
<li class="navigation__item">
|
||||||
|
<a href="https://cntx.masonliu.com" class="blog-button" target="_blank">CNTX</a>
|
||||||
|
</li>
|
||||||
|
<!-- <li class="navigation__item">
|
||||||
|
<a href="https://cntx.masonliu.com" class="blog-button" target="_blank">CNTX</a>
|
||||||
|
</li> -->
|
||||||
|
>>>>>>> 9072724cb39e1886486b20dc74bd2a78ee1b92d6
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user