Browse Source
Merge commit '610146a9fe3e2a4e4be64a1be3f62f1c5232dce2' into master_signhere
# Conflicts: # build.gradle # src/main/java/com/kdanmobile/kdanloginregisterui/BaseLoginView.kt # src/main/java/com/kdanmobile/kdanloginregisterui/LoginBView.kt # src/main/java/com/kdanmobile/kdanloginregisterui/RegisterBView.kt # src/main/java/com/kdanmobile/kdanloginregisterui/ResetPwdDialogFragment.kt # src/main/java/com/kdanmobile/kdanloginregisterui/widget/EmailLoginFormView.kt # src/main/java/com/kdanmobile/kdanloginregisterui/widget/EmailRegisterFormView.kt # src/main/res/layout-land/activity_login_a.xml # src/main/res/layout-land/activity_login_b.xml # src/main/res/layout-land/activity_register_a.xml # src/main/res/layout-land/activity_register_b.xml # src/main/res/layout/activity_bind_account.xml # src/main/res/layout/activity_login_a.xml # src/main/res/layout/activity_login_b.xml # src/main/res/layout/activity_register_a.xml # src/main/res/layout/activity_register_b.xml # src/main/res/layout/btn_email_login_register.xml # src/main/res/layout/btn_facebook_login_register.xml # src/main/res/layout/btn_google_login_register.xml # src/main/res/layout/dialog_email_login.xml # src/main/res/layout/dialog_email_register.xml # src/main/res/layout/edit_text_pwd.xml # src/main/res/layout/view_email_login_form.xml # src/main/res/layout/view_email_register_form.xml
