Merge lp://staging/~warp10/grouchery/grouchery-json into lp://staging/grouchery
Proposed by
Andrea Colangelo
| Status: | Merged |
|---|---|
| Merged at revision: | 30 |
| Proposed branch: | lp://staging/~warp10/grouchery/grouchery-json |
| Merge into: | lp://staging/grouchery |
| Prerequisite: | lp://staging/~warp10/grouchery/grouchery-unity |
| Diff against target: |
359 lines (+45/-227) 6 files modified
files/grouchery.conf (+1/-8) grouchery/app.py (+12/-9) grouchery/config.py (+26/-25) grouchery/gui.py (+0/-96) grouchery/include.py (+6/-1) grouchery/resources.py (+0/-88) |
| To merge this branch: | bzr merge lp://staging/~warp10/grouchery/grouchery-json |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrea Gasparini | Pending | ||
|
Review via email:
|
|||
Description of the change
JSON is now used to handle both configuration and fortunes list
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
