From: Dylan Lloyd Date: Sat, 26 Mar 2011 20:05:10 +0000 (-0400) Subject: Merge branch 'dev' of dylansserver.com:dylansserver into dev X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=8cd0bc0d71cd02a8f4921836c8a3089ed6a01c01;hp=99dc53dddd748917bef3d1d7d0ee847c785f6b26;p=dylansserver.git Merge branch 'dev' of dylansserver.com:dylansserver into dev --- diff --git a/index.php b/index.php index 8381c1b..dd94e83 100644 --- a/index.php +++ b/index.php @@ -86,7 +86,7 @@ abstract class cms { $this->title - + $stylesheets $scripts