Solving some conflicts, removing the language tags, and fixing the validations for the work hours in the calendar edit form

This commit is contained in:
Gustavo Adolfo Cruz Laura
2010-12-22 21:29:51 +00:00
parent 668aef173d
commit 9dca4be077

File diff suppressed because it is too large Load Diff