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

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
=== modified file 'pastebin.d/fpaste.org.conf'
--- pastebin.d/fpaste.org.conf 2009-08-11 02:26:03 +0000
+++ pastebin.d/fpaste.org.conf 2010-02-18 01:09:14 +0000
@@ -1,6 +1,3 @@
1# Another website that doesn't work due to unusual changes.
2# this is the Fedora Pastebin, sadly.
3
4[pastebin]1[pastebin]
5basename = fpaste.org2basename = fpaste.org
6regexp = "http://fpaste.org"3regexp = "http://fpaste.org"
@@ -8,7 +5,7 @@
8[format]5[format]
9user = author6user = author
10content = content7content = content
11format = lang8format = lexer
12submit = submit9submit = submit
13expire_options = expire_options10expire_options = expire_options
1411
1512
=== modified file 'pastebin.d/pastebin.com.conf'
--- pastebin.d/pastebin.com.conf 2009-05-03 15:06:09 +0000
+++ pastebin.d/pastebin.com.conf 2010-02-18 01:09:14 +0000
@@ -9,7 +9,7 @@
9version = version9version = version
10parentpid = parent_pid10parentpid = parent_pid
11format = format11format = format
12submit = paste12paste = paste
13remember = remember13remember = remember
14expiry = expiry14expiry = expiry
1515

Subscribers

People subscribed via source and target branches