Entrega final - #65

Open

carloscrespog wants to merge 19 commits into

ging:masterfrom

carloscrespog:master

Commits on Mar 29, 2012

Commits on Apr 12, 2012

resolved conflicts
carloscrespog
committed
cbe8968

Commits on Apr 15, 2012

Creado modelo y asociaciones
carloscrespog
committed
81ab45b

Commits on Apr 16, 2012

Entrega 6
carloscrespog
committed
4540a38

Commits on Apr 20, 2012

solved conflicts
carloscrespog
committed
530515e
Removed gem.lock and solved othe issues
carloscrespog
committed
1a4a680

Commits on Apr 22, 2012

Migración de geolocalización
carloscrespog
committed
951aa53
Gelocalizacion de sitios
carloscrespog
committed
50d764c
Geolocalización de viajes
carloscrespog
committed
82ac4bd
Contador de inclusion en viajes
carloscrespog
committed
fe34f3c

Commits on Apr 27, 2012

Implementado buscador
carloscrespog
committed
27eddd1
añadidos tests de funcionalidad
carloscrespog
committed
ab4b693
Documentación con RDoc
carloscrespog
committed
64dee53
Entrega final
carloscrespog
committed
90d0210
Entrega final retocado estilo
carloscrespog
committed
3f74fb2