error resolved
bug removed
pull commit
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
user DashBoard
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge https://github.com/makfire/gstudio into mongokit
user dashboard card view placed
conflict resolved
Resources are also display on translated topic page
Merge pull request #759 from AvadootNachankar/mongokit

MIS update - Student registration (Registration date)
Merge pull request #760 from sunnychaudhari/mywork

Resources are also linked on translated topic page according to 8 different categories
Check for invalid email in password reset added
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge pull request #761 from anujag/mongokit

check for invalid email in password/reset added
merged after corecting minor change in the scope of if condition.
Merge branch 'makfire-mongokit' into mongokit

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/views/file.py resolved.
Create Task- Calendar
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge pull request #762 from katkamrachana/mongokit

congratulations on your first commit!  keep on committing.