Commit 1a99b8d2 authored by 神楽坂玲奈's avatar 神楽坂玲奈

Merge branch 'master' of https://github.com/mycard/mycard-store

# Conflicts:
#	i18n.json
#	src/App.css
#	src/App.js
parent c2db1139
......@@ -287,16 +287,16 @@ export default class App extends Component {
<h2>代表作品</h2>
<div id="apps">
<div class="row">
<img alt="ygopro" src={require('../public/ygopro_1.jpg')} />
<img alt="OZ大乱斗NS" src={require('../public/ozns_1.jpg')} />
<img alt="Eddy紫" src={require('../public/eddyviolet_1.jpg')} />
<img alt="东方龙隐谈" src={require('../public/df02_1.jpg')} />
<a target="_blank" href="https://mycard.moe/ygopro/arena/"><img alt="ygopro" src={require('../public/ygopro_1.jpg')} /></a>
<a target="_blank" href="http://fuckoz.com/thread-3-1-1.html"><img alt="OZ大乱斗NS" src={require('../public/ozns_1.jpg')} /></a>
<a target="_blank" href="http://dgspitzer.my-style.in/gameportfolio/?p=139"><img alt="Eddy紫" src={require('../public/eddyviolet_1.jpg')} /></a>
<a target="_blank" href="https://tieba.baidu.com/p/4478725122"><img alt="东方龙隐谈" src={require('../public/df02_1.jpg')} /></a>
</div>
<div class="row">
<img alt="ygopro" src={require('../public/ygopro_2.jpg')} />
<img alt="OZ大乱斗NS" src={require('../public/ozns_2.jpg')} />
<img alt="Eddy紫" src={require('../public/eddyviolet_2.jpg')} />
<img alt="东方龙隐谈" src={require('../public/df02_2.jpg')} />
<a target="_blank" href="https://mycard.moe/ygopro/arena/"><img alt="ygopro" src={require('../public/ygopro_2.jpg')} /></a>
<a target="_blank" href="http://fuckoz.com/thread-3-1-1.html"><img alt="OZ大乱斗NS" src={require('../public/ozns_2.jpg')} /></a>
<a target="_blank" href="http://dgspitzer.my-style.in/gameportfolio/?p=139"><img alt="Eddy紫" src={require('../public/eddyviolet_2.jpg')} /></a>
<a target="_blank" href="https://tieba.baidu.com/p/4478725122"><img alt="东方龙隐谈" src={require('../public/df02_2.jpg')} /></a>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment