Merge branch 'master' of https://github.com/atom/electron
author大和屋 貴仁 <t.yamatoya@gloops.com>
Mon, 11 Jan 2016 05:12:43 +0000 (14:12 +0900)
committer大和屋 貴仁 <t.yamatoya@gloops.com>
Mon, 11 Jan 2016 05:12:43 +0000 (14:12 +0900)
commit630819e1d6032d4fc51c4540395b36949ec990c5
tree12c0222777e0c8e8b6d6d993f660f51347a12cb5
parent4f1be903c47ad1eca42a9ca6f666bfbe8911932c
parent20a92d7d1e6cc2763d34038a323b84c8c6c06fc2
Merge branch 'master' of https://github.com/atom/electron