• Lucas Braz Cunha's avatar
    Merge branch 'develop' into 'check_schedules' · 3ed09781
    Lucas Braz Cunha authored
    # Conflicts:
    #   app/build.gradle
    #   app/src/main/AndroidManifest.xml
    #   app/src/main/java/br/ufpr/c3sl/agendador/agendador/HomeActivity.java
    #   app/src/main/java/br/ufpr/c3sl/agendador/agendador/SchedulingActivity.java
    #   app/src/main/res/layout/appbar_home.xml
    #   app/src/main/res/layout/content_scheduling.xml
    #   app/src/main/res/values/strings.xml
    3ed09781
Name
Last commit
Last update
app Loading commit data...
gradle/wrapper Loading commit data...
.gitignore Loading commit data...
build.gradle Loading commit data...
gradle.properties Loading commit data...
gradlew Loading commit data...
gradlew.bat Loading commit data...
settings.gradle Loading commit data...