Pull requests

#9 Open
Repository
sashav sashav
Branch
default
Repository
diefenbach diefenbach
Branch
default

Swedish translations and application/json responses

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update default
hg pull -r default https://bitbucket.org/sashav/django-lfs
hg merge 8cf85954cc81
hg commit -m 'Merged in sashav/django-lfs (pull request #9)'
Author
  1. Sasha Vincic
Reviewers
Description

Hi

Finally I managed to merged our old changes into the current code, they should mainly consist of swedish translations, httpresponse returns applications/json for json responses so we can use XDV/Diazo theming and longer username/email so we can use email as username.

That should be all, can you try and merge. If there is any problem tell me since my HG knowledge is a little bit rusty. Had to redo the merge 3 times :(

/Sasha

Comments (0)