Anand Doshi c6aecb3f97 Merge branch 'master' into edge ... Conflicts: home/page/latest_updates/latest_updates.js hr/doctype/employee/employee.txt		2013-04-16 21:32:06 +05:30
..
locale	Adding German translation	2013-02-27 17:36:23 +01:00
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30
employee.js	[Leave Application] [fixes] Validate Leave Approver based on a list specified in Employee	2013-04-12 20:19:53 +05:30
employee.py	Merge branch 'master' into edge	2013-04-16 21:32:06 +05:30
employee.txt	Merge branch 'master' into edge	2013-04-16 21:32:06 +05:30
test_employee.py	added leave applications and block lists to calendar	2013-02-14 20:42:33 +05:30