diff options
| author | sreyes <sreyes@dataworks.com.py> | 2014-10-12 20:20:48 (GMT) |
|---|---|---|
| committer | sreyes <sreyes@dataworks.com.py> | 2014-10-12 20:20:48 (GMT) |
| commit | cc483ec621db687ea3b5cbfffd1bbab954b38510 (patch) | |
| tree | 036cb7faa30798de4ebe5b9ef2242ddfd700e6f7 /EjercitarJPA/build/classes/model/Ejercicio.class | |
| parent | 7a0ff6c9f17d87daeeab45292cbf1cd89c74cb0c (diff) | |
| parent | 4215a259c0bbecd9a135ce3a9fff674fab8757e0 (diff) | |
Merge remote-tracking branch 'remotes/origin/Cecilia' into samurey
Conflicts:
EjercitarJPA/build/classes/model/Ejercicio.class
EjercitarJPA/build/classes/model/Sesion.class
Diffstat (limited to 'EjercitarJPA/build/classes/model/Ejercicio.class')
0 files changed, 0 insertions, 0 deletions