diff options
| author | Alberto Duarte (PWC) <alberto.duarte.delgado@pwc.com> | 2023-06-08 11:49:18 +0100 |
|---|---|---|
| committer | Alberto Duarte (PWC) <alberto.duarte.delgado@pwc.com> | 2023-06-08 11:49:18 +0100 |
| commit | 3e20d3a79d8f5acd90229b398f4d181cc4ef35f5 (patch) | |
| tree | 62367c4633e7f0b699ed69340e66bb7a65d8012e /app/build.gradle | |
| parent | 90b1191a979af126db12b25072abe6fdbfcd323d (diff) | |
| parent | f17a201b593dd950e878fd3af03e435ff5cab3ef (diff) | |
Merge branch 'fran_nazario' of github.com:Asturfran/Proyecto-android-formacion into alberto_duarte
Conflicts:
app/src/main/java/com/frannazario/proyectoandroid/data/utils/StringUtils.kt
app/src/main/java/com/frannazario/proyectoandroid/data/viewmodels/SigninViewModel.kt
app/src/main/java/com/frannazario/proyectoandroid/presentation/fragments/SigninFragment.kt
app/src/main/res/layout/fragment_signin.xml
Diffstat (limited to 'app/build.gradle')
0 files changed, 0 insertions, 0 deletions