Permalink
Browse files

Merge branch 'develop' of git://github.com/scaryclam/django-rosetta i…

…nto develop

Conflicts:
	rosetta/views.py
  • Loading branch information...
2 parents a462b85 + 3d90b7e commit 4cbb4e9e124775d2820eedb15fa89cc5abae9f25 @user2589 committed Sep 16, 2011
Showing with 0 additions and 0 deletions.

0 comments on commit 4cbb4e9

Please sign in to comment.