kjb
route
ef
datepicker
Merge branch 'master' of https://github.com/Wawser/Wawser-V1.0
Revert "Merge branch 'master' of https://github.com/Wawser/Wawser-V1.0"

This reverts commit a758ce8a18bf4bee39c8ab300692bb134f2915b6, reversing
changes made to bdc73afc398c16c950d1b6eb846aca8ccfc521c5.
Revert "Revert "Merge branch 'master' of https://github.com/Wawser/Wawser-V1.0""

This reverts commit 0b9379e70b63448db110597bc298643778056036.
Revert "Revert "Revert "Merge branch 'master' of https://github.com/Wawser/Wawser-V1.0"""

This reverts commit ed30850f6024a014fcd526e1b65ea4e64bce990f.
revert
Merge branch 'master' of https://github.com/Wawser/Wawser-V1.0

Conflicts:
	DesarrolloWawser/Wawser/app/views/Footer.blade.php