The proposal to merge lp:~widelands-dev/widelands-website/django1_8 into lp:widelands-website has been updated.
Description changed to: Upgrade the website code to use Django 1.8 There are three text conflicts when merging which are caused by mixed indentations, IMHO. Especially the conflict in wlhelp.urls.py i couldn't find. I will resolve them when the real merge into trunk is done and before uploading trunk to launchpad. After merging with trunk, i want to make another test on alpha.widelands.org For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/django1_8/+merge/298561 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/django1_8 into lp:widelands-website. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
