OSDN Git Service

Merge branch 'master' of https://git.yuki-lab.xyz/git/Nakajima/serene-setup-wizard
authorhayao <shun819.mail@gmail.com>
Fri, 26 Apr 2019 12:02:30 +0000 (21:02 +0900)
committerhayao <shun819.mail@gmail.com>
Fri, 26 Apr 2019 12:02:30 +0000 (21:02 +0900)
commitc9643f262d8b20666527deded138c52a57eb21d8
tree260662f05159aa9b8e0cd29b4c3b947bddf63f8f
parent75fcd69c663a516d003785972308613a188e1a62
parentc72c50813e6526b65de8394de46fc7e6f576c00e
Merge branch 'master' of https://git.yuki-lab.xyz/git/Nakajima/serene-setup-wizard

# Conflicts:
# DEBIAN/control