Merge branch 'Signup' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2020/org.ntlab.amaryllis.client
# Conflicts:
#	app/src/main/AndroidManifest.xml
commit 12dd08c5c3111454a22be3f79e0c7385353f1ee9
2 parents 03587a3 + e344b23
n-nittta authored on 12 Jun 2020
Showing 6 changed files
View
.idea/gradle.xml
View
.idea/misc.xml
View
app/src/main/AndroidManifest.xml
View
app/src/main/java/org/ntlab/amaryllis/client/SignupActivity.java
View
app/src/main/res/layout/activity_signup.xml
View
build.gradle