Skip to content
Snippets Groups Projects
Commit 483823a0 authored by diegval's avatar diegval
Browse files

Merge branch 'eventoTrampa' into 'develop'

Feature: nueva opcion agregada al evento trampa, gastas dos de energía a...

See merge request !40
parents ae1f5b77 8105b048
No related branches found
No related tags found
2 merge requests!65Feature:,!40Feature: nueva opcion agregada al evento trampa, gastas dos de energía a...
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