git.openstreetmap.org Git - osqa.git/commit

]> git.openstreetmap.org Git - osqa.git/commit

author	jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
	Thu, 10 Mar 2011 22:36:25 +0000 (22:36 +0000)
committer	jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
	Thu, 10 Mar 2011 22:36:25 +0000 (22:36 +0000)
commit	13bee2f2e6aea2d936909861f3ab60bb09821a60
tree	79f079d7763259c4768931cb5e5f4ba1eb35baa2	tree \| snapshot
parent	7f4982393567a5f6827c12a089363d91338f9f13	commit \| diff

Reverting the merges due to unsuccessfull conflict resolvement.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@818 0cfe37f9-358a-4d5e-be75-b63607b5c754

29 files changed:

forum/authentication/__init__.py		diff \| blob \| history
forum/http_responses.py		diff \| blob \| history
forum/management/commands/module_command.py	[deleted file]	blob \| history
forum/models/node.py		diff \| blob \| history
forum/models/question.py		diff \| blob \| history
forum/models/tag.py		diff \| blob \| history
forum/models/user.py		diff \| blob \| history
forum/modules/__init__.py		diff \| blob \| history
forum/modules/decorators.py		diff \| blob \| history
forum/modules/template_loader.py	[deleted file]	blob \| history
forum/registry.py		diff \| blob \| history
forum/skins/__init__.py		diff \| blob \| history
forum/skins/default/templates/base_content.html		diff \| blob \| history
forum/skins/default/templates/node/award_points.html	[deleted file]	blob \| history
forum/templatetags/node_tags.py		diff \| blob \| history
forum/templatetags/ui_registry.py		diff \| blob \| history
forum/urls.py		diff \| blob \| history
forum/utils/userlinking.py		diff \| blob \| history
forum/views/auth.py		diff \| blob \| history
forum/views/commands.py		diff \| blob \| history
forum/views/meta.py		diff \| blob \| history
forum/views/readers.py		diff \| blob \| history
forum/views/vars.py	[deleted file]	blob \| history
forum/views/writers.py		diff \| blob \| history
forum_modules/openidauth/consumer.py		diff \| blob \| history
forum_modules/sximporter/importer.py		diff \| blob \| history
forum_modules/sximporter/views.py		diff \| blob \| history
settings.py		diff \| blob \| history
urls.py		diff \| blob \| history

OSQA

RSS Atom