Merge lp://staging/~blueyed/pastebinit/integration into lp://staging/pastebinit

Proposed by Daniel Hahler
Status: Merged
Merged at revision: 224
Proposed branch: lp://staging/~blueyed/pastebinit/integration
Merge into: lp://staging/pastebinit
Diff against target: 188 lines (+55/-25)
3 files modified
pastebin.d/dpaste.com.conf (+18/-0)
pastebinit (+34/-22)
test.sh (+3/-3)
To merge this branch: bzr merge lp://staging/~blueyed/pastebinit/integration
Reviewer Review Type Date Requested Status
Pastebinit Developers Pending
Review via email: mp+203655@code.staging.launchpad.net

Description of the change

This is an integration branch, which contains all the branches I proposed earlier.

It also fixes the change from `website` to `fetch_url` for the verbose message.

To post a comment you must log in.
209. By Daniel Hahler <email address hidden>

Merge branch 'pastebin-dpaste.com' into integration

Conflicts:
 pastebin.d/dpaste.com.conf

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: