Merge remote-tracking branch 'remotes/origin/master' into AddMember #7

Merged k-morimoto merged 1 commit into nitta-lab-2019:master from nitta-lab-2019:AddMember on 24 May 2019

2019-05-23	99e3741 Browse files » Merge remote-tracking branch 'remotes/origin/master' into AddMember ... # Conflicts: # app/src/main/res/values/strings.xml # gradle/wrapper/gradle-wrapper.properties マージによる漏れ分 t-tai committed on 23 May 2019