Skip to content
Snippets Groups Projects
Commit 8b7b3653 authored by diegval's avatar diegval
Browse files

Merge branch 'develop' into 'eventoTrampa'

# Conflicts:
#   app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/TipoEvento.kt
#   app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoFactorySelector.kt
parents fdb53d45 8e787a2b
Branches
No related tags found
2 merge requests!65Feature:,!39Feature: evento trampa implementado, sobre la cual por el momento hay tres...
Showing
with 284 additions and 56 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment