summaryrefslogtreecommitdiff
path: root/Schedule.mdwn
authorPortland State Aerospace Society <psas@psas.pdx.edu>2008-07-22 22:42:07 (GMT)
committer Portland State Aerospace Society <psas@psas.pdx.edu>2008-07-22 22:42:07 (GMT)
commitdeeeefdff00b45d6173464fdd7cc7b2ee53964bf (patch) (side-by-side diff)
treec737c7a795b386ba959f9ed5a437e523fa999c3e /Schedule.mdwn
parent0af05da744fcab0552aa063d6d64b26d2965950b (diff)
downloadwiki-deeeefdff00b45d6173464fdd7cc7b2ee53964bf.zip
wiki-deeeefdff00b45d6173464fdd7cc7b2ee53964bf.tar.gz
web commit by MariaWebster: Added link to oscon 2008 page.
Diffstat (limited to 'Schedule.mdwn') (more/less context) (ignore whitespace changes)
-rw-r--r--Schedule.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/Schedule.mdwn b/Schedule.mdwn
index 45b4629..a9f5d1a 100644
--- a/Schedule.mdwn
+++ b/Schedule.mdwn
@@ -1,7 +1,7 @@
Events
======
-- **July 21st - 25th** PSAS is displaying our rockets at OSCON. More news as it happens.
+- **July 23rd - 24th** PSAS is displaying our rockets at OSCON. Members can sign-up [[here|OsconBooth2008]]
- **September 26th - 28th**: [Arizona High Power Rocketry Association's](http://www.ahpra.org/) ['BALLS 2008' rocket launch](http://www.balls17.com/) in the [Black Rock Desert, Nevada](http://maps.google.com/maps?f=q&hl=en&geocode=&q=Black+Rock+Desert,+nevada&sll=40.65297,-119.3519&sspn=2.912971,5.471191&ie=UTF8&ll=40.910733,-119.05601&spn=11.600228,21.884766&t=h&z=6).
Team Meetings