pastebinit

Merge lp://staging/~cyphermox/pastebinit/fixes_fpaste+pastebin.com_pre1.0 into lp://staging/pastebinit

  1. fixes_fpaste+pastebin.com_pre1.0
  2. Merge into trunk
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~cyphermox/pastebinit/fixes_fpaste+pastebin.com_pre1.0
Merge into: lp://staging/pastebinit
Diff against target: 31 lines (+2/-5)
2 files modified
pastebin.d/fpaste.org.conf (+1/-4)
pastebin.d/pastebin.com.conf (+1/-1)
To merge this branch: bzr merge lp://staging/~cyphermox/pastebinit/fixes_fpaste+pastebin.com_pre1.0
Reviewer Review Type Date Requested Status
Pastebinit Developers Pending
Review via email: mp+19561@code.staging.launchpad.net
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
1=== modified file 'pastebin.d/fpaste.org.conf'
2--- pastebin.d/fpaste.org.conf 2009-08-11 02:26:03 +0000
3+++ pastebin.d/fpaste.org.conf 2010-02-18 01:09:14 +0000
4@@ -1,6 +1,3 @@
5-# Another website that doesn't work due to unusual changes.
6-# this is the Fedora Pastebin, sadly.
7-
8 [pastebin]
9 basename = fpaste.org
10 regexp = "http://fpaste.org"
11@@ -8,7 +5,7 @@
12 [format]
13 user = author
14 content = content
15-format = lang
16+format = lexer
17 submit = submit
18 expire_options = expire_options
19
20
21=== modified file 'pastebin.d/pastebin.com.conf'
22--- pastebin.d/pastebin.com.conf 2009-05-03 15:06:09 +0000
23+++ pastebin.d/pastebin.com.conf 2010-02-18 01:09:14 +0000
24@@ -9,7 +9,7 @@
25 version = version
26 parentpid = parent_pid
27 format = format
28-submit = paste
29+paste = paste
30 remember = remember
31 expiry = expiry
32

Subscribers

People subscribed via source and target branches