The diff is pretty messed up (for example local_settings.py.sample is reported to be removed and added). Could you refork from trunk and make a new branch with a clean history? -- https://code.launchpad.net/~trimardio/widelands-website/scheduling/+merge/330997 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/scheduling into lp:widelands-website.
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
