Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master

6 年之前 · 57d8418bf9
--- a/jm2l/static/img/2018/2018_jm2l_fond_site.png
+++ b/jm2l/static/img/2018/2018_jm2l_fond_site.png
--- a/jm2l/static/img/2018/2018_jm2l_fond_site2.png
+++ b/jm2l/static/img/2018/2018_jm2l_fond_site2.png
--- a/jm2l/static/img/2018/headerbg.png
+++ b/jm2l/static/img/2018/headerbg.png
--- a/jm2l/static/img/2018/logo.png
+++ b/jm2l/static/img/2018/logo.png