Merged branch 'dev' into rss
authorDylan Lloyd <dylan@psu.edu>
Sun, 10 Apr 2011 06:45:11 +0000 (02:45 -0400)
committerDylan Lloyd <dylan@psu.edu>
Sun, 10 Apr 2011 06:45:11 +0000 (02:45 -0400)
commitf599d79cf6bf53ad8e4e3164bc01c9b55ecc199f
treed41cde5c814e8beb8848b83ae8d9a7342231160b
parent05250f978cc7e3e1f7df92f20fd18f4667a06f2f
Merged branch 'dev' into rss
20 files changed:
.htaccess
captcha.php [new file with mode: 0644]
images/dylansserver.png [new file with mode: 0644]
includes/all.js [deleted file]
includes/comment.js [new file with mode: 0644]
includes/comment_validation.js [new file with mode: 0644]
includes/index.js [new file with mode: 0644]
includes/recaptchalib.php [new file with mode: 0644]
includes/style.css
index.php
notes/notes.php [deleted file]
projects/drawcss.html [deleted file]
projects/i_like_pandora.html [deleted file]
projects/peepshow.html [deleted file]
projects/readoo.html [deleted file]
projects/repthis.html [deleted file]
projects/youtube_backup.html [deleted file]
publish_notes.py
publish_projects.py
sample.ini