Commit f0abf459 authored by perfectdicky's avatar perfectdicky

Merge remote-tracking branch 'upstream/master'

parents 273a03a3 fbf3f81d
...@@ -2271,7 +2271,11 @@ $whitelist ...@@ -2271,7 +2271,11 @@ $whitelist
160212015 3 --Ancient Gear Barrage 160212015 3 --Ancient Gear Barrage
160212016 3 --Fullmetarion Ashurastar 160212016 3 --Fullmetarion Ashurastar
160212017 3 --Fullmetarion Vritrastar 160212017 3 --Fullmetarion Vritrastar
160212018 3 --Metarion Medustar
160212019 3 --Metarion Geniustar
160212025 3 --Imaginary Reactor 160212025 3 --Imaginary Reactor
160212026 3 --Attract Golem
160212027 3 --Evil Baller
160212029 3 --Imaginary Leading Actor 160212029 3 --Imaginary Leading Actor
160212036 3 --Metarion Fusion 160212036 3 --Metarion Fusion
160212041 3 --Grand Legend Saber 160212041 3 --Grand Legend Saber
......
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