Skip to content
Blame History Permalink
  • Nagarjuna's avatar
    Merge branch 'mongokit' of git://github.com/somya12/gstudio into somya12-mongokit · 7439fce2
    Nagarjuna authored 
    Conflicts resolved in the following files.
	gnowsys-ndf/gnowsys_ndf/factory_type.py
	gnowsys-ndf/gnowsys_ndf/ndf/management/commands/filldb.py
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/base.html
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_edit_base.html
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/task.html
	gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py
	gnowsys-ndf/gnowsys_ndf/settings.py
    7439fce2