2 Commits (227727e860c4689eb5d85c96780036851d05a913)

Author	SHA1	Message	Date
ustccjw	227727e860	fix conflict	2015-10-21 10:58:11 +08:00
Javi Velasco	614b1b14ba	Better variables and props for button	2015-10-21 00:48:24 +02:00