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

..

activity

role added in some pages

2013-04-09 11:49:42 +05:30

attributions

fixed slideshow

2013-03-12 11:07:45 +05:30

latest_updates

Merge branch 'master' into edge

2013-04-16 21:32:06 +05:30

__init__.py

moved directory structure

2012-09-24 19:13:42 +05:30