]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' into no-elements
authorDaniel Ehrenberg <littledan@Macintosh-103.local>
Fri, 6 Feb 2009 06:49:20 +0000 (00:49 -0600)
committerDaniel Ehrenberg <littledan@Macintosh-103.local>
Fri, 6 Feb 2009 06:49:20 +0000 (00:49 -0600)
commit3ec78f37663226bb79ecf132f3bd0b760028ed8d
treea263480f687bd1231700b44d2a318287af68555b
parentcc89943c085d02f7a590a64908627beffd2dc35e
parent28e644209c1c82c5e59cd49bf0680999f45c79bc
Merge branch 'master' into no-elements

Conflicts:

basis/html/templates/templates.factor
basis/furnace/chloe-tags/chloe-tags.factor
basis/html/templates/chloe/chloe.factor
basis/html/templates/templates.factor