Paul Merrill 4f8bd4da1f Merge branch 'sti' ...

Conflicts:
	inc/config.php
	inc/functions.php
	post.php

2010-11-04 05:16:13 -07:00

..

config.php

Merge branch 'sti'

2010-11-04 05:16:13 -07:00

display.php

Reformatted error(), moved commaize()

2010-11-04 04:41:52 -07:00

functions.php

Merge branch 'sti'

2010-11-04 05:16:13 -07:00

template.php

first commit

2010-11-02 21:57:33 +11:00

user.php

first commit

2010-11-02 21:57:33 +11:00