diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2009-06-16 19:50:03 -0400 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2009-06-16 19:50:03 -0400 |
| commit | e80e6024e4c13915dfde5a5b6a6397be45d34942 (patch) | |
| tree | ba547d8a373326e3cf44ab397cdf250cef043912 | |
| parent | 812eb458ebeb14b09f0e74a1006c14add0b309ce (diff) | |
| parent | 08b3bc9da6051e3c43229a68eb41fb57e5cff349 (diff) | |
| download | pillowcase-e80e6024e4c13915dfde5a5b6a6397be45d34942.tar.gz pillowcase-e80e6024e4c13915dfde5a5b6a6397be45d34942.tar.bz2 pillowcase-e80e6024e4c13915dfde5a5b6a6397be45d34942.zip | |
Merged unforgiving heads
| -rwxr-xr-x | includes/footer.php | 1 | ||||
| -rwxr-xr-x | pages/about.php | 2 |
2 files changed, 2 insertions, 1 deletions
| diff --git a/includes/footer.php b/includes/footer.php index da2d072..588af02 100755 --- a/includes/footer.php +++ b/includes/footer.php | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | <LI><A HREF="/archive.htm">Archive</A></LI> | 4 | <LI><A HREF="/archive.htm">Archive</A></LI> |
| 5 | <LI><A HREF="/contribute.htm">Contribute</A></LI> | 5 | <LI><A HREF="/contribute.htm">Contribute</A></LI> |
| 6 | <LI><A HREF="http://fourisland.com/fourm/viewforum.php?f=55">Fourm</A></LI> | 6 | <LI><A HREF="http://fourisland.com/fourm/viewforum.php?f=55">Fourm</A></LI> |
| 7 | <LI><A HREF="http://www.facebook.com/pages/Pillowcase/115478704391">Facebook</A></LI> | ||
| 7 | </UL> | 8 | </UL> |
| 8 | </DIV> | 9 | </DIV> |
| 9 | 10 | ||
| diff --git a/pages/about.php b/pages/about.php index c85544f..c8990a8 100755 --- a/pages/about.php +++ b/pages/about.php | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | <P> | 3 | <P> |
| 4 | Pillowcase is a <A HREF="http://fourisland.com/">Four Island</A> project, majorly operated by Starla Insigna, though | 4 | Pillowcase is a <A HREF="http://fourisland.com/">Four Island</A> project, majorly operated by Starla Insigna, though |
| 5 | it is possible that other people may have contributed to it (see <A HREF="/contribute.php">contributing</A>). | 5 | it is possible that other people may have contributed to it (see <A HREF="/contribute.htm">contributing</A>). |
| 6 | </P> | 6 | </P> |
| 7 | 7 | ||
| 8 | <P> | 8 | <P> |