devel merge

2019-05-05 17:58:27 +09:00
parent 00a6e9798f e731371ab1
commit 816c2ac1c4
43 changed files with 1714 additions and 107 deletions
@@ -85,4 +85,4 @@ color:white;

 #sidebar button{
    /*width:100px;*/
-}
+}