Merge lp://staging/~daker/loco-team-portal/fix.779853 into lp://staging/loco-team-portal
Proposed by
Adnane Belmadiaf
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Adnane Belmadiaf | ||||||||
| Approved revision: | 632 | ||||||||
| Merged at revision: | 630 | ||||||||
| Proposed branch: | lp://staging/~daker/loco-team-portal/fix.779853 | ||||||||
| Merge into: | lp://staging/loco-team-portal | ||||||||
| Diff against target: |
333 lines (+74/-40) 11 files modified
loco_directory/events/feeds.py (+19/-4) loco_directory/locale/loco-directory.pot (+17/-16) loco_directory/meetings/feeds.py (+16/-4) loco_directory/settings.py (+2/-1) loco_directory/teams/feeds.py (+10/-3) loco_directory/templates/events/team_event_detail_comments.inc.html (+1/-4) loco_directory/templates/feeds/events_description.html (+4/-4) loco_directory/templates/feeds/events_title.html (+1/-1) loco_directory/templates/feeds/meetings_description.html (+2/-2) loco_directory/templates/feeds/teams_title.html (+1/-1) loco_directory/templates/feeds/title.html (+1/-0) |
||||||||
| To merge this branch: | bzr merge lp://staging/~daker/loco-team-portal/fix.779853 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| LoCo Team Portal Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Support for language in feed url
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
