Merge lp://staging/~pablorubianes-uy/ubuconla-web/trunk into lp://staging/ubuconla-web/2012
Proposed by
Pablo Rubianes
| Status: | Merged |
|---|---|
| Approved by: | Pablo Rubianes |
| Approved revision: | 5 |
| Merged at revision: | 5 |
| Proposed branch: | lp://staging/~pablorubianes-uy/ubuconla-web/trunk |
| Merge into: | lp://staging/ubuconla-web/2012 |
| Diff against target: |
194 lines (+50/-15) 9 files modified
aside.html (+10/-0) charlas.php (+0/-1) css/registracion.css (+14/-0) css/style.css (+9/-6) donde.php (+4/-4) head_aside_long.html (+8/-0) index.php (+2/-1) menu.html (+2/-2) registrarse.php (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~pablorubianes-uy/ubuconla-web/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Pablo Rubianes | Approve | ||
|
Review via email:
|
|||
Commit message
merge 2
Description of the change
modificaciones varias de los ultimos dias:
registracion,
mapa de donde
y otras cosas.
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
merge