Merge lp://staging/~guiona/bilboplanet/669551 into lp://staging/~greg-theclimber/bilboplanet/testing
Proposed by
Gregoire de Hemptinne
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 154 | ||||
| Proposed branch: | lp://staging/~guiona/bilboplanet/669551 | ||||
| Merge into: | lp://staging/~greg-theclimber/bilboplanet/testing | ||||
| Diff against target: |
1146 lines (+322/-126) (has conflicts) 21 files modified
admin/api/manage-account_api.php (+5/-8) admin/api/manage-feed_api.php (+10/-9) admin/api/manage-moderation_api.php (+7/-5) admin/api/manage-option_api.php (+10/-13) admin/api/manage-permissions_api.php (+6/-6) admin/api/manage-site_api.php (+10/-10) admin/api/manage-user_api.php (+13/-11) admin/manage-cache.php (+8/-1) admin/manage-feed.php (+1/-1) admin/manage-newsletter.php (+20/-10) admin/manage-post.php (+10/-1) admin/manage-useroption.php (+34/-13) admin/meta/css/styles.css (+57/-0) admin/meta/js/jquery.bilboplanet.js (+31/-1) admin/meta/js/jquery.bilboplanet.min.js (+1/-1) admin/meta/js/manage-account.js (+2/-1) admin/meta/js/manage-feed.js (+39/-12) admin/meta/js/manage-moderation.js (+4/-2) admin/meta/js/manage-option.js (+1/-1) admin/meta/js/manage-permissions.js (+6/-3) admin/meta/js/manage-user.js (+47/-17) Text conflict in admin/meta/js/manage-feed.js Text conflict in admin/meta/js/manage-user.js |
||||
| To merge this branch: | bzr merge lp://staging/~guiona/bilboplanet/669551 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gregoire de Hemptinne | Pending | ||
|
Review via email:
|
|||
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
