Merge lp:~timojbo/widelands-website/new-help into lp:widelands-website
Proposed by
Timo Paulssen
Status: | Merged |
---|---|
Merged at revision: | 238 |
Proposed branch: | lp:~timojbo/widelands-website/new-help |
Merge into: | lp:widelands-website |
Diff against target: |
102 lines (+34/-6) 6 files modified
online_help/management/commands/update_help.py (+6/-2) online_help/templates/building_details.html (+2/-0) online_help/templates/inlines/display_worker.html (+1/-1) online_help/templates/ware_details.html (+23/-1) online_help/templates/worker_details.html (+2/-0) online_help/views.py (+0/-2) |
To merge this branch: | bzr merge lp:~timojbo/widelands-website/new-help |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Widelands Developers | Pending | ||
Review via email: mp+40258@code.launchpad.net |
Description of the change
cool stuff (working this time)
To post a comment you must log in.