Skip to content
Snippets Groups Projects
Commit 30e90f86 authored by diegval's avatar diegval
Browse files

Merge branch 'eventoTrampa' into 'develop'

Feature: evento trampa implementado, sobre la cual por el momento hay tres...

See merge request !39
parents 8e787a2b 8b7b3653
Loading
Showing
with 169 additions and 12 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment