factor/extra/webapps/pastebin
Daniel Ehrenberg fad00e2316 Merge branch 'master' of git://factorcode.org/git/factor
Conflicts:

	extra/html/elements/elements.factor
	extra/html/html.factor
	extra/tar/tar.factor
	extra/webapps/pastebin/pastebin.factor

Resolving my stupid use conflict
2008-02-01 15:39:42 -06:00
..
annotate-paste.furnace
annotation.furnace
authors.txt
footer.furnace
header.furnace
modes.furnace
new-paste.furnace
paste-list.furnace
paste-summary.furnace
pastebin.factor Merge branch 'master' of git://factorcode.org/git/factor 2008-02-01 15:39:42 -06:00
show-paste.furnace
style.css
syntax.furnace