From: Dylan Lloyd <dylan@psu.edu>
Date: Fri, 25 Mar 2011 00:18:17 +0000 (-0400)
Subject: Merge branch 'ajax' into dev
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=8d2cf39d98794c59a92155d9e119db205f431436;p=dylansserver.git

Merge branch 'ajax' into dev
---

8d2cf39d98794c59a92155d9e119db205f431436
diff --cc index.php
index f151a74,740157b..424f850
--- a/index.php
+++ b/index.php
@@@ -120,14 -136,16 +136,15 @@@ END_OF_CLOSE
  
  }
  
+ 
  class index extends cms {
- 	public function display() {
- 	  $this->display_head();
- 	  $this->display_exhibits();
- 	  echo "<ul id=\"portfolio\" style=\"text-align:right\">";
- 	  $this->list_projects();
- 	  echo <<<OTHER_PROJECTS
-         <li>
+ 
+   public function display() {
+     $this->display_head();
+     $this->display_exhibits();
+     echo "<ul id='portfolio' style='text-align:right'>";
+     $this->list_projects();
+     echo <<<OTHER_PROJECTS
 -        <li>
            <h3>things i've done for others:</h3>
          </li>